diff -urN VTK-6.1.0.old/CMake/JavaDependencies.cmake.in VTK-6.1.0.new/CMake/JavaDependencies.cmake.in --- VTK-6.1.0.old/CMake/JavaDependencies.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ VTK-6.1.0.new/CMake/JavaDependencies.cmake.in 2014-03-09 00:16:11.000000000 +0100 @@ -0,0 +1,4 @@ +# This file is automatically generated by CMake VTK_WRAP_JAVA +SET(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES} +@VTK_JAVA_DEPENDENCIES_FILE@ +) diff -urN VTK-6.1.0.old/CMake/VTKConfig.cmake.in VTK-6.1.0.new/CMake/VTKConfig.cmake.in --- VTK-6.1.0.old/CMake/VTKConfig.cmake.in 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/CMake/VTKConfig.cmake.in 2014-03-09 00:16:12.000000000 +0100 @@ -26,7 +26,7 @@ # Load requested modules. # List of available VTK modules. -set(VTK_MODULES_ENABLED) +set(VTK_MODULES_ENABLED "${VTK_MODULES_ENABLED}") # Determine list of available VTK-modules by scanning the VTK_MODULES_DIR. file(GLOB config_files RELATIVE "${VTK_MODULES_DIR}" "${VTK_MODULES_DIR}/*.cmake") diff -urN VTK-6.1.0.old/CMake/vtkModuleMacros.cmake VTK-6.1.0.new/CMake/vtkModuleMacros.cmake --- VTK-6.1.0.old/CMake/vtkModuleMacros.cmake 2014-03-09 00:17:00.000000000 +0100 +++ VTK-6.1.0.new/CMake/vtkModuleMacros.cmake 2014-03-09 00:16:12.000000000 +0100 @@ -188,6 +188,9 @@ if(${vtk-module}_EXCLUDE_FROM_WRAPPING) set(_code "${_code}set(${vtk-module}_EXCLUDE_FROM_WRAPPING 1)\n") endif() + if(NOT ${vtk-module}_EXCLUDE_FROM_WRAPPING AND ${VTK_WRAP_TCL} AND ${vtk-module}_TCL_NAME) + set(_code "${_code}set(${vtk-module}_TCL_NAME \"${${vtk-module}_TCL_NAME}\")\n") + endif() if(${vtk-module}_IMPLEMENTS) set(_code "${_code}set(${vtk-module}_IMPLEMENTS \"${${vtk-module}_IMPLEMENTS}\")\n") endif() @@ -295,6 +298,11 @@ # Configure wrapping information for external wrapping of headers. configure_file(${_VTKModuleMacros_DIR}/vtkModuleHeaders.cmake.in ${VTK_MODULES_DIR}/${vtk-module}-Headers.cmake @ONLY) + if (NOT VTK_INSTALL_NO_DEVELOPMENT AND NOT ${vtk-module}_EXCLUDE_FROM_WRAPPING) + install(FILES ${VTK_MODULES_DIR}/${vtk-module}-Headers.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR}/Modules + COMPONENT Development) + endif() endfunction() macro(vtk_module_test) diff -urN VTK-6.1.0.old/CMake/vtkModuleTop.cmake VTK-6.1.0.new/CMake/vtkModuleTop.cmake --- VTK-6.1.0.old/CMake/vtkModuleTop.cmake 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/CMake/vtkModuleTop.cmake 2014-03-09 00:16:12.000000000 +0100 @@ -325,16 +325,21 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) install(FILES ${VTK_BINARY_DIR}/CMakeFiles/VTKConfig.cmake ${VTK_BINARY_DIR}/VTKConfigVersion.cmake + ${VTK_BINARY_DIR}/CTestCustom.cmake CMake/exportheader.cmake.in CMake/GenerateExportHeader.cmake CMake/pythonmodules.h.in CMake/UseVTK.cmake CMake/FindTCL.cmake + CMake/TopologicalSort.cmake CMake/vtkTclTkMacros.cmake CMake/vtk-forward.c.in CMake/vtkForwardingExecutable.cmake + CMake/vtkGroups.cmake CMake/vtkJavaWrapping.cmake CMake/vtkMakeInstantiator.cmake + CMake/vtkMakeInstantiator.cxx.in + CMake/vtkMakeInstantiator.h.in CMake/vtkModuleAPI.cmake CMake/vtkModuleHeaders.cmake.in CMake/vtkModuleInfo.cmake.in @@ -342,6 +347,7 @@ CMake/vtkExternalModuleMacros.cmake CMake/vtkObjectFactory.cxx.in CMake/vtkObjectFactory.h.in + CMake/vtkPythonPackages.cmake CMake/vtkPythonWrapping.cmake CMake/vtkTclWrapping.cmake CMake/vtkThirdParty.cmake @@ -353,6 +359,7 @@ CMake/vtkWrapPythonSIP.cmake CMake/vtkWrapPython.sip.in CMake/vtkWrapTcl.cmake + CMake/JavaDependencies.cmake.in DESTINATION ${VTK_INSTALL_PACKAGE_DIR}) get_property(VTK_TARGETS GLOBAL PROPERTY VTK_TARGETS) diff -urN VTK-6.1.0.old/CMake/vtkWrapJava.cmake VTK-6.1.0.new/CMake/vtkWrapJava.cmake --- VTK-6.1.0.old/CMake/vtkWrapJava.cmake 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/CMake/vtkWrapJava.cmake 2014-03-09 00:16:12.000000000 +0100 @@ -71,6 +71,8 @@ SET(VTK_JAVA_DEPENDENCIES) SET(VTK_JAVA_DEPENDENCIES_FILE) + + FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}") # For each class FOREACH(FILE ${SOURCES}) @@ -109,13 +111,13 @@ # add custom command to output ADD_CUSTOM_COMMAND( - OUTPUT ${VTK_JAVA_HOME}/${TMP_FILENAME}.java + OUTPUT ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/${TMP_FILENAME}.java DEPENDS ${VTK_PARSE_JAVA_EXE} ${VTK_WRAP_HINTS} ${TMP_INPUT} ${_args_file} ${KIT_HIERARCHY_FILE} COMMAND ${VTK_PARSE_JAVA_EXE} ARGS "${quote}@${_args_file}${quote}" - "-o" "${quote}${VTK_JAVA_HOME}/${TMP_FILENAME}.java${quote}" + "-o" "${quote}${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/${TMP_FILENAME}.java${quote}" "${quote}${TMP_INPUT}${quote}" COMMENT "Java Wrappings - generating ${TMP_FILENAME}.java" ) @@ -133,9 +135,9 @@ COMMENT "Java Wrappings - generating ${TMP_WRAPPED_FILENAME}" ) - SET(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES} "${VTK_JAVA_HOME}/${TMP_FILENAME}.java") + SET(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES} "${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/${TMP_FILENAME}.java") SET(VTK_JAVA_DEPENDENCIES_FILE - "${VTK_JAVA_DEPENDENCIES_FILE}\n \"${VTK_JAVA_HOME}/${TMP_FILENAME}.java\"") + "${VTK_JAVA_DEPENDENCIES_FILE}\n \"${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/${TMP_FILENAME}.java\"") # Add this output to a custom target if needed. IF(VTK_WRAP_JAVA_NEED_CUSTOM_TARGETS) @@ -155,11 +157,7 @@ ENDFOREACH(FILE) ADD_CUSTOM_TARGET("${TARGET}JavaClasses" ALL DEPENDS ${VTK_JAVA_DEPENDENCIES}) - SET(dir ${CMAKE_CURRENT_SOURCE_DIR}) - IF(VTK_WRAP_JAVA3_INIT_DIR) - SET(dir ${VTK_WRAP_JAVA3_INIT_DIR}) - ENDIF(VTK_WRAP_JAVA3_INIT_DIR) - CONFIGURE_FILE("${dir}/JavaDependencies.cmake.in" + CONFIGURE_FILE("${VTK_CMAKE_DIR}/JavaDependencies.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/JavaDependencies.cmake" @ONLY) endmacro() diff -urN VTK-6.1.0.old/CMakeLists.txt VTK-6.1.0.new/CMakeLists.txt --- VTK-6.1.0.old/CMakeLists.txt 2014-03-09 00:17:00.000000000 +0100 +++ VTK-6.1.0.new/CMakeLists.txt 2014-03-09 00:16:12.000000000 +0100 @@ -325,8 +325,7 @@ # Java package location. set(VTK_JAVA_JAR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vtk.jar) - set(VTK_JAVA_HOME ${VTK_BINARY_DIR}/java/vtk) - file(MAKE_DIRECTORY ${VTK_JAVA_HOME}) + file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}) else() set(Module_vtkWrappingJava OFF CACHE BOOL "Core Java wrapping library" FORCE) diff -urN VTK-6.1.0.old/Common/Core/CMakeLists.txt VTK-6.1.0.new/Common/Core/CMakeLists.txt --- VTK-6.1.0.old/Common/Core/CMakeLists.txt 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Common/Core/CMakeLists.txt 2014-03-09 00:16:11.000000000 +0100 @@ -232,6 +232,7 @@ vtkMappedDataArray.h vtkMathUtilities.h vtkNew.h + vtkPointAccumulator.hxx vtkSetGet.h vtkSmartPointer.h vtkTemplateAliasMacro.h diff -urN VTK-6.1.0.old/Common/DataModel/CMakeLists.txt VTK-6.1.0.new/Common/DataModel/CMakeLists.txt --- VTK-6.1.0.old/Common/DataModel/CMakeLists.txt 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Common/DataModel/CMakeLists.txt 2014-03-09 00:16:11.000000000 +0100 @@ -212,6 +212,8 @@ vtkCellType.h vtkMappedUnstructuredGrid.h vtkMappedUnstructuredGridCellIterator.h + vtkMarchingCubesCases.h + vtkMarchingCubesTriangleCases.h ) set_source_files_properties( diff -urN VTK-6.1.0.old/Examples/Build/vtkLocal/JavaDependencies.cmake.in VTK-6.1.0.new/Examples/Build/vtkLocal/JavaDependencies.cmake.in --- VTK-6.1.0.old/Examples/Build/vtkLocal/JavaDependencies.cmake.in 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Examples/Build/vtkLocal/JavaDependencies.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# This file is automatically generated by CMake VTK_WRAP_JAVA -SET(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES} -@VTK_JAVA_DEPENDENCIES_FILE@ -) - diff -urN VTK-6.1.0.old/Examples/Build/vtkMy/CMakeOptions.cmake VTK-6.1.0.new/Examples/Build/vtkMy/CMakeOptions.cmake --- VTK-6.1.0.old/Examples/Build/vtkMy/CMakeOptions.cmake 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Examples/Build/vtkMy/CMakeOptions.cmake 2014-03-09 00:16:12.000000000 +0100 @@ -130,8 +130,7 @@ ENDIF (WIN32) # Tell the java wrappers where to go. - SET(VTK_JAVA_HOME ${VTKMY_BINARY_DIR}/java/vtkmy) - FILE(MAKE_DIRECTORY ${VTK_JAVA_HOME}) + FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}) ENDIF (VTKMY_WRAP_JAVA) ELSE (VTK_WRAP_JAVA) diff -urN VTK-6.1.0.old/Examples/Build/vtkMy/Wrapping/JavaDependencies.cmake.in VTK-6.1.0.new/Examples/Build/vtkMy/Wrapping/JavaDependencies.cmake.in --- VTK-6.1.0.old/Examples/Build/vtkMy/Wrapping/JavaDependencies.cmake.in 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Examples/Build/vtkMy/Wrapping/JavaDependencies.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# This file is automatically generated by CMake VTK_WRAP_JAVA -SET(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES} -@VTK_JAVA_DEPENDENCIES_FILE@ -) - diff -urN VTK-6.1.0.old/Filters/Statistics/CMakeLists.txt VTK-6.1.0.new/Filters/Statistics/CMakeLists.txt --- VTK-6.1.0.old/Filters/Statistics/CMakeLists.txt 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Filters/Statistics/CMakeLists.txt 2014-03-09 00:16:11.000000000 +0100 @@ -22,4 +22,8 @@ ABSTRACT ) +set(vtkFiltersStatistics_HDRS + vtkStatisticsAlgorithmPrivate.h +) + vtk_module_library(vtkFiltersStatistics ${Module_SRCS}) diff -urN VTK-6.1.0.old/IO/Import/CMakeLists.txt VTK-6.1.0.new/IO/Import/CMakeLists.txt --- VTK-6.1.0.old/IO/Import/CMakeLists.txt 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/IO/Import/CMakeLists.txt 2014-03-09 00:16:11.000000000 +0100 @@ -9,4 +9,10 @@ ABSTRACT ) +# add missing development headers +set(vtkIOImport_HDRS + vtk3DS.h + vtkVRML.h +) + vtk_module_library(vtkIOImport ${Module_SRCS}) diff -urN VTK-6.1.0.old/ThirdParty/ftgl/CMakeLists.txt VTK-6.1.0.new/ThirdParty/ftgl/CMakeLists.txt --- VTK-6.1.0.old/ThirdParty/ftgl/CMakeLists.txt 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/ThirdParty/ftgl/CMakeLists.txt 2014-03-09 00:16:11.000000000 +0100 @@ -132,6 +132,15 @@ CONFIGURE_FILE(${VTKFTGL_SOURCE_DIR}/vtkftglConfig.h.in ${VTKFTGL_BINARY_DIR}/vtkftglConfig.h) +# install devel files +IF(NOT VTK_INSTALL_NO_DEVELOPMENT) + INSTALL(FILES + ${VTKFTGL_BINARY_DIR}/vtkftglConfig.h + src/FTGL.h + DESTINATION ${VTK_INSTALL_INCLUDE_DIR} + COMPONENT Development) +ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) + # # Build examples (testing purposes) # (Warning, they use Glut) diff -urN VTK-6.1.0.old/Wrapping/Java/CMakeLists.txt VTK-6.1.0.new/Wrapping/Java/CMakeLists.txt --- VTK-6.1.0.old/Wrapping/Java/CMakeLists.txt 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Wrapping/Java/CMakeLists.txt 2014-03-09 00:16:12.000000000 +0100 @@ -151,7 +151,7 @@ # KITS is used in vtkSettings.java.in ( module name no prefix ) string(REGEX REPLACE "vtk" "" KITS "${_MODULES_TO_WRAP}") configure_file(${VTK_SOURCE_DIR}/Wrapping/Java/vtk/vtkSettings.java.in - ${VTK_BINARY_DIR}/java/vtk/vtkSettings.java) + ${VTK_BINARY_DIR}/java/${PROJECT_NAME}/vtkSettings.java) # configure vtkNativeLibrary.java to enable loading of VTK module libraries set(VTK_JAVA_NATIVE_LIBRARIES) @@ -171,10 +171,10 @@ string(REGEX REPLACE "^(.*),\n$" "\\1;\n" VTK_JAVA_NATIVE_LIBRARIES ${VTK_JAVA_NATIVE_LIBRARIES}) configure_file(${VTK_SOURCE_DIR}/Wrapping/Java/vtk/vtkNativeLibrary.java.in - ${VTK_BINARY_DIR}/java/vtk/vtkNativeLibrary.java) + ${VTK_BINARY_DIR}/java/${PROJECT_NAME}/vtkNativeLibrary.java) # Add to class list so classes get cleaned up -list(APPEND VTK_JAVA_CLASS_FILES ${VTK_BINARY_DIR}/java/vtk/vtkSettings.class) +list(APPEND VTK_JAVA_CLASS_FILES ${VTK_BINARY_DIR}/java/${PROJECT_NAME}/vtkSettings.class) set(VTK_JAVA_DEPENDENCIES CellType @@ -256,9 +256,9 @@ # Copy over the sample Java files foreach(jfile ${VTK_JAVA_SAMPLE_DEPENDENCIES}) set(src ${VTK_SOURCE_DIR}/Wrapping/Java/vtk/sample/${jfile}.java) - set(dst ${VTK_JAVA_HOME}/sample/${jfile}.java) + set(dst ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/sample/${jfile}.java) list(APPEND VTK_JAVA_SOURCE_FILES ${dst}) - set(class ${VTK_JAVA_HOME}/sample/${jfile}.class) + set(class ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/sample/${jfile}.class) # Add to class list so classes get cleaned up list(APPEND VTK_JAVA_CLASS_FILES ${class}) configure_file(${src} ${dst} COPYONLY) @@ -267,9 +267,9 @@ # Copy over the handcrafted Java classes foreach(jfile ${VTK_JAVA_DEPENDENCIES}) set(src ${VTK_SOURCE_DIR}/Wrapping/Java/vtk/${jfile}.java) - set(dst ${VTK_JAVA_HOME}/${jfile}.java) + set(dst ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/${jfile}.java) list(APPEND VTK_JAVA_SOURCE_FILES ${dst}) - set(class ${VTK_JAVA_HOME}/${jfile}.class) + set(class ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/${jfile}.class) # Add to class list so classes get cleaned up list(APPEND VTK_JAVA_CLASS_FILES ${class}) if(jfile MATCHES "vtkSettings" OR jfile MATCHES "vtkNativeLibrary") @@ -285,15 +285,15 @@ endif() if(VTK_JAVA_SWT_COMPONENT) - set(SWT_FILES "${VTK_BINARY_DIR}/java/vtk/rendering/swt/*.java") + set(SWT_FILES "${VTK_BINARY_DIR}/java/${PROJECT_NAME}/rendering/swt/*.java") endif() if(VTK_JAVA_JOGL_COMPONENT) - set(JOGL_FILES "${VTK_BINARY_DIR}/java/vtk/rendering/jogl/*.java" "${VTK_BINARY_DIR}/java/vtk/sample/rendering/JoglConeRendering.java") + set(JOGL_FILES "${VTK_BINARY_DIR}/java/${PROJECT_NAME}/rendering/jogl/*.java" "${VTK_BINARY_DIR}/java/${PROJECT_NAME}/sample/rendering/JoglConeRendering.java") endif() # Handle Java class path -set(JAVA_COMPILATION_CLASSPATH "${VTK_JAVA_HOME}/..") +set(JAVA_COMPILATION_CLASSPATH "${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}/..") if(ECLIPSE_SWT_LIBRARIES) set(JAVA_COMPILATION_CLASSPATH "${JAVA_COMPILATION_CLASSPATH}${SEPARATOR}${ECLIPSE_SWT_LIBRARIES}") endif() @@ -310,7 +310,7 @@ DEPENDS ${VTK_JAVA_SOURCE_FILES} COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -source 1.5 -classpath ${JAVA_COMPILATION_CLASSPATH} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java - ${VTK_BINARY_DIR}/java/vtk/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/awt/*.java ${VTK_BINARY_DIR}/java/vtk/sample/*.java ${SWT_FILES} ${JOGL_FILES} + ${VTK_BINARY_DIR}/java/${PROJECT_NAME}/*.java ${VTK_BINARY_DIR}/java/${PROJECT_NAME}/rendering/*.java ${VTK_BINARY_DIR}/java/${PROJECT_NAME}/rendering/awt/*.java ${VTK_BINARY_DIR}/java/${PROJECT_NAME}/sample/*.java ${SWT_FILES} ${JOGL_FILES} COMMAND ${CMAKE_COMMAND} -E touch ${VTK_BINARY_DIR}/java/javac_stamp.txt COMMENT "Compiling Java Classes" ) diff -urN VTK-6.1.0.old/Wrapping/Java/JavaDependencies.cmake.in VTK-6.1.0.new/Wrapping/Java/JavaDependencies.cmake.in --- VTK-6.1.0.old/Wrapping/Java/JavaDependencies.cmake.in 2014-01-22 16:55:41.000000000 +0100 +++ VTK-6.1.0.new/Wrapping/Java/JavaDependencies.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# This file is automatically generated by CMake VTK_WRAP_JAVA -SET(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES} -@VTK_JAVA_DEPENDENCIES_FILE@ -)