For another project, please consult its home page to locate the current issue tracker.
View Issue Details [ Jump to Notes ] | [ Print ] | ||||||||
ID | Project | Category | View Status | Date Submitted | Last Update | ||||
0014157 | ParaView | (No Category) | public | 2013-06-28 18:31 | 2016-08-12 09:59 | ||||
Reporter | Orion Poplawski | ||||||||
Assigned To | Kitware Robot | ||||||||
Priority | normal | Severity | minor | Reproducibility | have not tried | ||||
Status | closed | Resolution | moved | ||||||
Platform | OS | OS Version | |||||||
Product Version | |||||||||
Target Version | Fixed in Version | ||||||||
Summary | 0014157: Allow compilation of ParaView with external VTK | ||||||||
Description | We need to be able to build ParaView with an external VTK. First issue encountered was: CMake Error at CMake/ParaViewModuleTop.cmake:61 (include): include could not find load file: vtkGroups Call Stack (most recent call first): CMakeLists.txt:495 (include) CMake Error at CMake/ParaViewModuleTop.cmake:184 (include): include could not find load file: TopologicalSort This can be fixed by installing those files. The attached patch fixes that. Next issue is: CMake Error: File /Wrapping/Java/JavaDependencies.cmake.in does not exist. CMake Error at /usr/lib64/cmake/vtk/vtkWrapJava.cmake:162 (CONFIGURE_FILE): configure_file Problem configuring file Call Stack (most recent call first): /usr/lib64/cmake/vtk/vtkJavaWrapping.cmake:40 (vtk_wrap_java3) /usr/lib64/cmake/vtk/vtkWrapping.cmake:67 (vtk_add_java_wrapping) /usr/lib64/cmake/vtk/vtkModuleMacros.cmake:565 (vtk_add_wrapping) ParaViewCore/VTKExtensions/Core/CMakeLists.txt:81 (vtk_module_library) Two issues - JavaDependencies.cmake.in is not installed, and vtkWrapJava.cmake is not looking for it in the correct place. Code is: 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" "${CMAKE_CURRENT_BINARY_DIR}/JavaDependencies.cmake" IMMEDIATE @ONLY) From vtkJavaWrapping.cmake: set(VTK_WRAP_JAVA3_INIT_DIR "${VTK_SOURCE_DIR}/Wrapping/Java") So it looks like this is just not capable of being run outside of the VTK source tree. | ||||||||
Tags | No tags attached. | ||||||||
Project | TBD | ||||||||
Topic Name | |||||||||
Type | incorrect functionality | ||||||||
Attached Files | vtk-install.patch [^] (770 bytes) 2013-06-28 18:31 [Show Content] [Hide Content]diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake --- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600 +++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-06-28 16:12:02.837198769 -0600 @@ -330,9 +330,11 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) 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/vtkModuleAPI.cmake CMake/vtkModuleHeaders.cmake.in vtk-6.1.0.patch [^] (15,817 bytes) 2014-03-08 18:53 [Show Content] [Hide Content] 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@ -) paraview-4.1.0.patch [^] (26,251 bytes) 2014-03-08 18:53 [Show Content] [Hide Content] diff -urN ParaView-v4.1.0.old/CMake/CTestCustom.cmake.in ParaView-v4.1.0.new/CMake/CTestCustom.cmake.in --- ParaView-v4.1.0.old/CMake/CTestCustom.cmake.in 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMake/CTestCustom.cmake.in 2014-03-09 00:29:34.000000000 +0100 @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ # Inherit VTK's exclusions. We don't have to redefine them in this file anymore. -include("@VTK_BINARY_DIR@/CTestCustom.cmake") +include("@VTK_CMAKE_DIR@/CTestCustom.cmake") #------------------------------------------------------------------------------ # Regular expression for warning exception during build process diff -urN ParaView-v4.1.0.old/CMake/ParaViewModuleTop.cmake ParaView-v4.1.0.new/CMake/ParaViewModuleTop.cmake --- ParaView-v4.1.0.old/CMake/ParaViewModuleTop.cmake 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMake/ParaViewModuleTop.cmake 2014-03-09 00:29:34.000000000 +0100 @@ -280,7 +280,11 @@ #message("vtk-module = ${vtk-module}") include("${${_module}_SOURCE_DIR}/vtk-module-init.cmake" OPTIONAL) - add_subdirectory("${${_module}_SOURCE_DIR}" "${${_module}_BINARY_DIR}") + if("${${_module}_SOURCE_DIR}" STREQUAL "${${_module}_BINARY_DIR}") + message(WARNING "\nmodule ${_module} seems not installed\n") + else() + add_subdirectory("${${_module}_SOURCE_DIR}" "${${_module}_BINARY_DIR}") + endif() endforeach() vtk_module_config(VTK ${VTK_MODULES_ENABLED}) diff -urN ParaView-v4.1.0.old/CMake/ParaViewTestInstall.cmake ParaView-v4.1.0.new/CMake/ParaViewTestInstall.cmake --- ParaView-v4.1.0.old/CMake/ParaViewTestInstall.cmake 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMake/ParaViewTestInstall.cmake 2014-03-09 00:29:34.000000000 +0100 @@ -40,9 +40,11 @@ # PARAVIEW_TEST_DIR : Temporary directory for location of Examples build tree # PARAVIEW_VERSION : ParaView version string used when creating the installtree +set (ENV{DESTDIR} ${PARAVIEW_TEST_DIR}/test-install) + message (STATUS "Building Examples against ParaView install tree") set (ParaView_DIR - ${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION}) + $ENV{DESTDIR}${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION}) # Build target "INSTALL" for paraview if (MSVC) @@ -62,6 +64,10 @@ message(FATAL_ERROR "Could not build target 'install' for ParaView") endif () +# we have not done a final install so let's get the correct ParaViewConfig.cmake +execute_process (COMMAND ${CMAKE_COMMAND} + -E copy ${PARAVIEW_BINARY_DIR}/ParaViewConfig.cmake ${ParaView_DIR}) + set (INSTALL_TEST_BUILD_DIR ${PARAVIEW_TEST_DIR}/Examples-bld) if (NOT EXISTS ${INSTALL_TEST_BUILD_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} -E @@ -69,7 +75,7 @@ endif () execute_process ( COMMAND ${CMAKE_COMMAND} - -DParaView_DIR:PATH=${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION} + -DParaView_DIR:PATH=${ParaView_DIR} ${PARAVIEW_SOURCE_DIR}/Examples WORKING_DIRECTORY ${INSTALL_TEST_BUILD_DIR} RESULT_VARIABLE crv) diff -urN ParaView-v4.1.0.old/CMakeLists.txt ParaView-v4.1.0.new/CMakeLists.txt --- ParaView-v4.1.0.old/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -503,6 +503,10 @@ # location. set (VTK_MODULES_DIR ${PARAVIEW_MODULES_DIR}) + find_file(VTK_CONFIG_FILE "VTKConfig.cmake" ${VTK_CMAKE_DIR}) + + # vtk_module_library points to ${VTK_SOURCE_DIR} for add_test() calls + set (VTK_SOURCE_DIR ${ParaView_SOURCE_DIR}/VTK) else() # Update CMAKE_MODULE_PATH to include VTK's cmake files. @@ -529,6 +533,7 @@ set(VTK_Group_StandAlone OFF CACHE BOOL "" FORCE) set(VTK_Group_Rendering OFF CACHE BOOL "" FORCE) + set(VTK_CONFIG_FILE "${ParaView_BINARY_DIR}/VTK/VTKConfig.cmake") endif() #---------------------------------------------------------------------------------- @@ -567,6 +572,9 @@ ) endif() +if ( ${PARAVIEW_ENABLE_PYTHON} ) + find_package(PythonLibs) +endif ( ${PARAVIEW_ENABLE_PYTHON} ) include(ParaViewModuleTop) #---------------------------------------------------------------------------------- diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Clone1/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Clone1/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Clone1/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Clone1/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) project(Clone1) -FIND_PACKAGE(ParaView REQUIRED) -INCLUDE(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Clone1 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Clone2/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Clone2/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Clone2/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Clone2/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(Clone2) -FIND_PACKAGE(ParaView REQUIRED) -INCLUDE(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Clone2 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Demo0/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Demo0/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Demo0/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Demo0/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(Demo0) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Demo0 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Demo1/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Demo1/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Demo1/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Demo1/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(Demo1) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Demo1 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/MultiServerClient/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/MultiServerClient/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/MultiServerClient/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/MultiServerClient/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -32,8 +32,10 @@ cmake_minimum_required(VERSION 2.8.8) project(MultiServerClient) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "MultiServerClient example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(ParticlesViewer) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "ParticlesViewer example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Spreadsheet/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Spreadsheet/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Spreadsheet/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Spreadsheet/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(SpreadSheet) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "SpreadSheet example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/Plugins/Autostart/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Autostart/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Autostart/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Autostart/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -3,10 +3,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) QT4_WRAP_CPP(MOC_SRCS pqMyApplicationStarter.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS pqMyPanelDecorator.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/DockWidget/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/DockWidget/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/DockWidget/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/DockWidget/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS ExampleDockPanel.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/Filter/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Filter/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Filter/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Filter/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) include(ParaViewPlugins) diff -urN ParaView-v4.1.0.old/Examples/Plugins/GUIObjectPanel/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/GUIObjectPanel/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/GUIObjectPanel/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/GUIObjectPanel/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -3,10 +3,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS pqConePanel.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/GUIToolBar/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/GUIToolBar/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/GUIToolBar/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/GUIToolBar/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -3,10 +3,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS MyToolBarActions.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/GUIView/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/GUIView/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/GUIView/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/GUIView/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) # moc the Qt based .h files diff -urN ParaView-v4.1.0.old/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -11,10 +11,10 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) include(ParaViewPlugins) diff -urN ParaView-v4.1.0.old/Examples/Plugins/ParametricSource/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/ParametricSource/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/ParametricSource/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/ParametricSource/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -5,10 +5,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) ADD_PARAVIEW_PLUGIN(SMParametricSource "1.0" SERVER_MANAGER_XML ParametricSource.xml) diff -urN ParaView-v4.1.0.old/Examples/Plugins/PropertyWidgets/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/PropertyWidgets/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/PropertyWidgets/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/PropertyWidgets/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -2,10 +2,10 @@ # pqPropertyWidgetDecorator instances for customizing the Properties panel. cmake_minimum_required(VERSION 2.8.8) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (PARAVIEW_BUILD_QT_GUI) diff -urN ParaView-v4.1.0.old/Examples/Plugins/Reader/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Reader/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Reader/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Reader/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) # The pqReader.xml file contains xml defining readers with their file diff -urN ParaView-v4.1.0.old/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -2,10 +2,10 @@ # then the binary can be loaded in ParaView. cmake_minimum_required(VERSION 2.8) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) add_paraview_plugin( ReaderXMLOnly "1.0" diff -urN ParaView-v4.1.0.old/Examples/Plugins/RenderPassViews/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/RenderPassViews/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/RenderPassViews/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/RenderPassViews/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,15 +4,10 @@ # 1> Render View with Shadow Maps and # 2> Render View with Edge detection -IF (ParaView_SOURCE_DIR) - INCLUDE_DIRECTORIES( - ${VTK_INCLUDE_DIR} - ${PARAVIEW_INCLUDE_DIRS} - ) -ELSE (ParaView_SOURCE_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF (ParaView_SOURCE_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS RegisterRenderPassViews.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/Representation/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Representation/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Representation/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Representation/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,7 +1,7 @@ -IF (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF (NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) ADD_PARAVIEW_PLUGIN(Representation "1.0" SERVER_MANAGER_XML Representation.xml diff -urN ParaView-v4.1.0.old/Examples/Plugins/RepresentationBehavior/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/RepresentationBehavior/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/RepresentationBehavior/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/RepresentationBehavior/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) QT4_WRAP_CPP(MOC_SRCS pqRepresentationBehaviorStarter.h diff -urN ParaView-v4.1.0.old/Examples/Plugins/SMProxy/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/SMProxy/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/SMProxy/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/SMProxy/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -8,10 +8,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) diff -urN ParaView-v4.1.0.old/Examples/Plugins/SourceToolbar/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/SourceToolbar/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/SourceToolbar/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/SourceToolbar/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -2,10 +2,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) # We need to wrap for Qt stuff such as signals/slots etc. to work correctly. diff -urN ParaView-v4.1.0.old/Examples/Plugins/VisItReader/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/VisItReader/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/VisItReader/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/VisItReader/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT TARGET vtkIOVisItBridge) message(FATAL_ERROR diff -urN ParaView-v4.1.0.old/Examples/Plugins/Writer/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Writer/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Writer/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Writer/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) ADD_PARAVIEW_PLUGIN(MyTiffWriter "1.0" SERVER_MANAGER_XML writers.xml diff -urN ParaView-v4.1.0.old/ParaViewConfig.cmake.in ParaView-v4.1.0.new/ParaViewConfig.cmake.in --- ParaView-v4.1.0.old/ParaViewConfig.cmake.in 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/ParaViewConfig.cmake.in 2014-03-09 00:29:34.000000000 +0100 @@ -12,9 +12,10 @@ set (PARAVIEW_CONFIG_TARGETS_FILE "${location}/ParaViewTargets.cmake") else() # The ParaView is in the build-location. - set (VTK_CONFIG_FILE "@ParaView_BINARY_DIR@/VTK/VTKConfig.cmake") + set (VTK_CONFIG_FILE "@VTK_CONFIG_FILE@") set (ParaView_CMAKE_DIR "@ParaView_CMAKE_DIR@") set (PARAVIEW_CONFIG_TARGETS_FILE "@ParaView_BINARY_DIR@/ParaViewTargets.cmake") + set (PARAVIEW_MODULES_DIR "@PARAVIEW_MODULES_DIR@") endif() #------------------------------------------------------------------------------ @@ -45,6 +46,27 @@ set (VTK_FIND_COMPONENTS vtkPVServerManagerApplication) endif() +if (NOT __pv_install_tree) + # If we're building against an external VTK library than the modules are spread + # between the installation directory of VTK and in the directory where the just built + # paraview modules are located. We need a 2-step hack to detect all the modules + + message("calling CMakeLists.txt: ${CMAKE_PARENT_LIST_FILE}") + + # 1) let's collect the just built paraview modules + file(GLOB config_files RELATIVE "${PARAVIEW_MODULES_DIR}" "${PARAVIEW_MODULES_DIR}/*.cmake") + foreach (_file ${config_files}) + if (NOT "${_file}" MATCHES "[^\\-]+-[a-zA-Z]+\\.cmake") + string(REGEX REPLACE "\\.cmake$" "" _module "${_file}") + list(APPEND VTK_MODULES_ENABLED "${_module}") + message(" - appeding ${_module}") + endif() + endforeach() + + # 2) let's give vtk_module_load the possibility to find the paraview modules + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PARAVIEW_MODULES_DIR}) +endif() + set (VTK_FIND_COMPONENTS ${VTK_FIND_COMPONENTS} ${ParaView_FIND_COMPONENTS}) include("${VTK_CONFIG_FILE}") diff -urN ParaView-v4.1.0.old/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt ParaView-v4.1.0.new/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt --- ParaView-v4.1.0.old/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt 2014-01-11 15:00:10.000000000 +0100 +++ ParaView-v4.1.0.new/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -24,7 +24,7 @@ ENDIF() IF(NOT DEFINED QtTesting_INSTALL_CMAKE_DIR) - SET(QtTesting_INSTALL_CMAKE_DIR lib/CMake) + SET(QtTesting_INSTALL_CMAKE_DIR ${VTK_INSTALL_PACKAGE_DIR}) ENDIF() IF(NOT DEFINED QT_TESTING_EVENT_PLAYBACK_DELAY) diff -urN ParaView-v4.1.0.old/Wrapping/Python/CMakeLists.txt ParaView-v4.1.0.new/Wrapping/Python/CMakeLists.txt --- ParaView-v4.1.0.old/Wrapping/Python/CMakeLists.txt 2014-01-11 15:00:00.000000000 +0100 +++ ParaView-v4.1.0.new/Wrapping/Python/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -39,7 +39,10 @@ set(PV_PYTHON_MODULE_BINARY_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/site-packages/paraview") # Copy generated module files from VTK into place in the build tree -set(_vtkpy_modules vtkpython_pyc) +set(_vtkpy_modules) +if( NOT ${PARAVIEW_USING_EXTERNAL_VTK} ) + set(_vtkpy_modules vtkpython_pyc) +endif( NOT ${PARAVIEW_USING_EXTERNAL_VTK} ) if (TARGET vtkWebPython) list(APPEND _vtkpy_modules vtkWebPython) endif() paraview-4.1.0-v2.patch [^] (26,151 bytes) 2014-03-08 19:07 [Show Content] [Hide Content] diff -urN ParaView-v4.1.0.old/CMake/CTestCustom.cmake.in ParaView-v4.1.0.new/CMake/CTestCustom.cmake.in --- ParaView-v4.1.0.old/CMake/CTestCustom.cmake.in 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMake/CTestCustom.cmake.in 2014-03-09 00:29:34.000000000 +0100 @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ # Inherit VTK's exclusions. We don't have to redefine them in this file anymore. -include("@VTK_BINARY_DIR@/CTestCustom.cmake") +include("@VTK_CMAKE_DIR@/CTestCustom.cmake") #------------------------------------------------------------------------------ # Regular expression for warning exception during build process diff -urN ParaView-v4.1.0.old/CMake/ParaViewModuleTop.cmake ParaView-v4.1.0.new/CMake/ParaViewModuleTop.cmake --- ParaView-v4.1.0.old/CMake/ParaViewModuleTop.cmake 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMake/ParaViewModuleTop.cmake 2014-03-09 00:29:34.000000000 +0100 @@ -280,7 +280,11 @@ #message("vtk-module = ${vtk-module}") include("${${_module}_SOURCE_DIR}/vtk-module-init.cmake" OPTIONAL) - add_subdirectory("${${_module}_SOURCE_DIR}" "${${_module}_BINARY_DIR}") + if("${${_module}_SOURCE_DIR}" STREQUAL "${${_module}_BINARY_DIR}") + message(FATAL_ERROR "\nmodule ${_module} seems not installed\n") + else() + add_subdirectory("${${_module}_SOURCE_DIR}" "${${_module}_BINARY_DIR}") + endif() endforeach() vtk_module_config(VTK ${VTK_MODULES_ENABLED}) diff -urN ParaView-v4.1.0.old/CMake/ParaViewTestInstall.cmake ParaView-v4.1.0.new/CMake/ParaViewTestInstall.cmake --- ParaView-v4.1.0.old/CMake/ParaViewTestInstall.cmake 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMake/ParaViewTestInstall.cmake 2014-03-09 00:29:34.000000000 +0100 @@ -40,9 +40,11 @@ # PARAVIEW_TEST_DIR : Temporary directory for location of Examples build tree # PARAVIEW_VERSION : ParaView version string used when creating the installtree +set (ENV{DESTDIR} ${PARAVIEW_TEST_DIR}/test-install) + message (STATUS "Building Examples against ParaView install tree") set (ParaView_DIR - ${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION}) + $ENV{DESTDIR}${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION}) # Build target "INSTALL" for paraview if (MSVC) @@ -62,6 +64,10 @@ message(FATAL_ERROR "Could not build target 'install' for ParaView") endif () +# we have not done a final install so let's get the correct ParaViewConfig.cmake +execute_process (COMMAND ${CMAKE_COMMAND} + -E copy ${PARAVIEW_BINARY_DIR}/ParaViewConfig.cmake ${ParaView_DIR}) + set (INSTALL_TEST_BUILD_DIR ${PARAVIEW_TEST_DIR}/Examples-bld) if (NOT EXISTS ${INSTALL_TEST_BUILD_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} -E @@ -69,7 +75,7 @@ endif () execute_process ( COMMAND ${CMAKE_COMMAND} - -DParaView_DIR:PATH=${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION} + -DParaView_DIR:PATH=${ParaView_DIR} ${PARAVIEW_SOURCE_DIR}/Examples WORKING_DIRECTORY ${INSTALL_TEST_BUILD_DIR} RESULT_VARIABLE crv) diff -urN ParaView-v4.1.0.old/CMakeLists.txt ParaView-v4.1.0.new/CMakeLists.txt --- ParaView-v4.1.0.old/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -503,6 +503,10 @@ # location. set (VTK_MODULES_DIR ${PARAVIEW_MODULES_DIR}) + find_file(VTK_CONFIG_FILE "VTKConfig.cmake" ${VTK_CMAKE_DIR}) + + # vtk_module_library points to ${VTK_SOURCE_DIR} for add_test() calls + set (VTK_SOURCE_DIR ${ParaView_SOURCE_DIR}/VTK) else() # Update CMAKE_MODULE_PATH to include VTK's cmake files. @@ -529,6 +533,7 @@ set(VTK_Group_StandAlone OFF CACHE BOOL "" FORCE) set(VTK_Group_Rendering OFF CACHE BOOL "" FORCE) + set(VTK_CONFIG_FILE "${ParaView_BINARY_DIR}/VTK/VTKConfig.cmake") endif() #---------------------------------------------------------------------------------- @@ -567,6 +572,9 @@ ) endif() +if ( ${PARAVIEW_ENABLE_PYTHON} ) + find_package(PythonLibs) +endif ( ${PARAVIEW_ENABLE_PYTHON} ) include(ParaViewModuleTop) #---------------------------------------------------------------------------------- diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Clone1/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Clone1/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Clone1/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Clone1/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) project(Clone1) -FIND_PACKAGE(ParaView REQUIRED) -INCLUDE(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Clone1 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Clone2/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Clone2/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Clone2/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Clone2/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(Clone2) -FIND_PACKAGE(ParaView REQUIRED) -INCLUDE(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Clone2 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Demo0/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Demo0/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Demo0/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Demo0/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(Demo0) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Demo0 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Demo1/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Demo1/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Demo1/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Demo1/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(Demo1) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "Demo1 example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/MultiServerClient/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/MultiServerClient/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/MultiServerClient/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/MultiServerClient/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -32,8 +32,10 @@ cmake_minimum_required(VERSION 2.8.8) project(MultiServerClient) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "MultiServerClient example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/ParticlesViewer/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(ParticlesViewer) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "ParticlesViewer example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/CustomApplications/Spreadsheet/CMakeLists.txt ParaView-v4.1.0.new/Examples/CustomApplications/Spreadsheet/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/CustomApplications/Spreadsheet/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/CustomApplications/Spreadsheet/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 2.8.8) project(SpreadSheet) -find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) +IF (NOT ParaViewExamples_BINARY_DIR) + FIND_PACKAGE(ParaView REQUIRED) + INCLUDE(${PARAVIEW_USE_FILE}) +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT PARAVIEW_BUILD_QT_GUI) message(FATAL_ERROR "SpreadSheet example requires PARAVIEW_BUILD_QT_GUI to be enabled. " diff -urN ParaView-v4.1.0.old/Examples/Plugins/Autostart/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Autostart/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Autostart/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Autostart/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -3,10 +3,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) QT4_WRAP_CPP(MOC_SRCS pqMyApplicationStarter.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/DisplayPanelDecorator/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS pqMyPanelDecorator.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/DockWidget/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/DockWidget/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/DockWidget/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/DockWidget/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS ExampleDockPanel.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/Filter/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Filter/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Filter/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Filter/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) include(ParaViewPlugins) diff -urN ParaView-v4.1.0.old/Examples/Plugins/GUIObjectPanel/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/GUIObjectPanel/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/GUIObjectPanel/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/GUIObjectPanel/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -3,10 +3,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS pqConePanel.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/GUIToolBar/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/GUIToolBar/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/GUIToolBar/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/GUIToolBar/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -3,10 +3,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS MyToolBarActions.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/GUIView/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/GUIView/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/GUIView/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/GUIView/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) # moc the Qt based .h files diff -urN ParaView-v4.1.0.old/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/HiddenLinesRemoval/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -11,10 +11,10 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) include(ParaViewPlugins) diff -urN ParaView-v4.1.0.old/Examples/Plugins/ParametricSource/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/ParametricSource/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/ParametricSource/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/ParametricSource/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -5,10 +5,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) ADD_PARAVIEW_PLUGIN(SMParametricSource "1.0" SERVER_MANAGER_XML ParametricSource.xml) diff -urN ParaView-v4.1.0.old/Examples/Plugins/PropertyWidgets/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/PropertyWidgets/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/PropertyWidgets/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/PropertyWidgets/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -2,10 +2,10 @@ # pqPropertyWidgetDecorator instances for customizing the Properties panel. cmake_minimum_required(VERSION 2.8.8) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (PARAVIEW_BUILD_QT_GUI) diff -urN ParaView-v4.1.0.old/Examples/Plugins/Reader/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Reader/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Reader/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Reader/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) # The pqReader.xml file contains xml defining readers with their file diff -urN ParaView-v4.1.0.old/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/ReaderXMLOnly/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -2,10 +2,10 @@ # then the binary can be loaded in ParaView. cmake_minimum_required(VERSION 2.8) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) add_paraview_plugin( ReaderXMLOnly "1.0" diff -urN ParaView-v4.1.0.old/Examples/Plugins/RenderPassViews/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/RenderPassViews/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/RenderPassViews/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/RenderPassViews/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,15 +4,10 @@ # 1> Render View with Shadow Maps and # 2> Render View with Edge detection -IF (ParaView_SOURCE_DIR) - INCLUDE_DIRECTORIES( - ${VTK_INCLUDE_DIR} - ${PARAVIEW_INCLUDE_DIRS} - ) -ELSE (ParaView_SOURCE_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF (ParaView_SOURCE_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) QT4_WRAP_CPP(MOC_SRCS RegisterRenderPassViews.h) diff -urN ParaView-v4.1.0.old/Examples/Plugins/Representation/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Representation/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Representation/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Representation/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,7 +1,7 @@ -IF (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF (NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) ADD_PARAVIEW_PLUGIN(Representation "1.0" SERVER_MANAGER_XML Representation.xml diff -urN ParaView-v4.1.0.old/Examples/Plugins/RepresentationBehavior/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/RepresentationBehavior/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/RepresentationBehavior/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/RepresentationBehavior/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) QT4_WRAP_CPP(MOC_SRCS pqRepresentationBehaviorStarter.h diff -urN ParaView-v4.1.0.old/Examples/Plugins/SMProxy/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/SMProxy/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/SMProxy/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/SMProxy/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -8,10 +8,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) diff -urN ParaView-v4.1.0.old/Examples/Plugins/SourceToolbar/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/SourceToolbar/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/SourceToolbar/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/SourceToolbar/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -2,10 +2,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) IF(PARAVIEW_BUILD_QT_GUI) # We need to wrap for Qt stuff such as signals/slots etc. to work correctly. diff -urN ParaView-v4.1.0.old/Examples/Plugins/VisItReader/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/VisItReader/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/VisItReader/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/VisItReader/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) -if (NOT ParaView_BINARY_DIR) +IF (NOT ParaViewExamples_BINARY_DIR) find_package(ParaView REQUIRED) include(${PARAVIEW_USE_FILE}) -endif() +ENDIF (NOT ParaViewExamples_BINARY_DIR) if (NOT TARGET vtkIOVisItBridge) message(FATAL_ERROR diff -urN ParaView-v4.1.0.old/Examples/Plugins/Writer/CMakeLists.txt ParaView-v4.1.0.new/Examples/Plugins/Writer/CMakeLists.txt --- ParaView-v4.1.0.old/Examples/Plugins/Writer/CMakeLists.txt 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/Examples/Plugins/Writer/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -4,10 +4,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -IF(NOT ParaView_BINARY_DIR) +IF(NOT ParaViewExamples_BINARY_DIR) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) -ENDIF(NOT ParaView_BINARY_DIR) +ENDIF (NOT ParaViewExamples_BINARY_DIR) ADD_PARAVIEW_PLUGIN(MyTiffWriter "1.0" SERVER_MANAGER_XML writers.xml diff -urN ParaView-v4.1.0.old/ParaViewConfig.cmake.in ParaView-v4.1.0.new/ParaViewConfig.cmake.in --- ParaView-v4.1.0.old/ParaViewConfig.cmake.in 2014-01-11 14:59:57.000000000 +0100 +++ ParaView-v4.1.0.new/ParaViewConfig.cmake.in 2014-03-09 00:29:34.000000000 +0100 @@ -12,9 +12,10 @@ set (PARAVIEW_CONFIG_TARGETS_FILE "${location}/ParaViewTargets.cmake") else() # The ParaView is in the build-location. - set (VTK_CONFIG_FILE "@ParaView_BINARY_DIR@/VTK/VTKConfig.cmake") + set (VTK_CONFIG_FILE "@VTK_CONFIG_FILE@") set (ParaView_CMAKE_DIR "@ParaView_CMAKE_DIR@") set (PARAVIEW_CONFIG_TARGETS_FILE "@ParaView_BINARY_DIR@/ParaViewTargets.cmake") + set (PARAVIEW_MODULES_DIR "@PARAVIEW_MODULES_DIR@") endif() #------------------------------------------------------------------------------ @@ -45,6 +46,24 @@ set (VTK_FIND_COMPONENTS vtkPVServerManagerApplication) endif() +if (NOT __pv_install_tree) + # If we're building against an external VTK library than the modules are spread + # between the installation directory of VTK and in the directory where the just built + # paraview modules are located. We need a 2-step hack to detect all the modules + + # 1) let's collect the just built paraview modules + file(GLOB config_files RELATIVE "${PARAVIEW_MODULES_DIR}" "${PARAVIEW_MODULES_DIR}/*.cmake") + foreach (_file ${config_files}) + if (NOT "${_file}" MATCHES "[^\\-]+-[a-zA-Z]+\\.cmake") + string(REGEX REPLACE "\\.cmake$" "" _module "${_file}") + list(APPEND VTK_MODULES_ENABLED "${_module}") + endif() + endforeach() + + # 2) let's give vtk_module_load the possibility to find the paraview modules + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PARAVIEW_MODULES_DIR}) +endif() + set (VTK_FIND_COMPONENTS ${VTK_FIND_COMPONENTS} ${ParaView_FIND_COMPONENTS}) include("${VTK_CONFIG_FILE}") diff -urN ParaView-v4.1.0.old/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt ParaView-v4.1.0.new/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt --- ParaView-v4.1.0.old/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt 2014-01-11 15:00:10.000000000 +0100 +++ ParaView-v4.1.0.new/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -24,7 +24,7 @@ ENDIF() IF(NOT DEFINED QtTesting_INSTALL_CMAKE_DIR) - SET(QtTesting_INSTALL_CMAKE_DIR lib/CMake) + SET(QtTesting_INSTALL_CMAKE_DIR ${VTK_INSTALL_PACKAGE_DIR}) ENDIF() IF(NOT DEFINED QT_TESTING_EVENT_PLAYBACK_DELAY) diff -urN ParaView-v4.1.0.old/Wrapping/Python/CMakeLists.txt ParaView-v4.1.0.new/Wrapping/Python/CMakeLists.txt --- ParaView-v4.1.0.old/Wrapping/Python/CMakeLists.txt 2014-01-11 15:00:00.000000000 +0100 +++ ParaView-v4.1.0.new/Wrapping/Python/CMakeLists.txt 2014-03-09 00:29:34.000000000 +0100 @@ -39,7 +39,10 @@ set(PV_PYTHON_MODULE_BINARY_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/site-packages/paraview") # Copy generated module files from VTK into place in the build tree -set(_vtkpy_modules vtkpython_pyc) +set(_vtkpy_modules) +if( NOT ${PARAVIEW_USING_EXTERNAL_VTK} ) + set(_vtkpy_modules vtkpython_pyc) +endif( NOT ${PARAVIEW_USING_EXTERNAL_VTK} ) if (TARGET vtkWebPython) list(APPEND _vtkpy_modules vtkWebPython) endif() | ||||||||
Relationships | |
Relationships |
Notes | |
(0032340) Orion Poplawski (reporter) 2014-02-17 00:37 |
Trying again with VTK 6.1.0 and ParaView 4.1.0, get: CMake Error at CMake/ParaViewModuleTop.cmake:283 (add_subdirectory): add_subdirectory not given a binary directory but the given source directory "/builddir/build/BUILD/ParaView-v4.1.0" is not a subdirectory of "/builddir/build/BUILD/ParaView-v4.1.0". When specifying an out-of-tree source a binary directory must be explicitly specified. Call Stack (most recent call first): CMakeLists.txt:570 (include) CMake Error at /usr/lib64/cmake/vtk/vtkModuleAPI.cmake:53 (message): No such module: "vtkPythonInterpreter" Call Stack (most recent call first): /usr/lib64/cmake/vtk/vtkModuleAPI.cmake:15 (vtk_module_load) /usr/lib64/cmake/vtk/vtkModuleAPI.cmake:132 (_vtk_module_config_recurse) /usr/lib64/cmake/vtk/vtkModuleMacros.cmake:136 (vtk_module_config) /usr/lib64/cmake/vtk/vtkModuleMacros.cmake:480 (vtk_module_impl) ParaViewCore/ClientServerStream/CMakeLists.txt:48 (vtk_module_library) |
(0032460) efferre79 (reporter) 2014-03-08 18:52 |
I have started from VTK-6.1.0 and ParaView-4.1.0 sources and created two patches. In this way I'm able to compile ParaView against the external installed VTK. This is just a try (there are a few hacks that require a better approach improving and fixing the build system) but at the same time many hunks in the patches fix real errors. Looking forward to see integrated this kind of functionality in the next versions of VTK and Paraview: - less disk space with only one installed VTK version - reduced maintenance effort, just require a specific external version of VTK to compile against |
(0038417) Kitware Robot (administrator) 2016-08-12 09:59 |
Resolving issue as `moved`. This issue tracker is no longer used. Further discussion of this issue may take place in the current ParaView Issues page linked in the banner at the top of this page. |
Notes |
Issue History | |||
Date Modified | Username | Field | Change |
2013-06-28 18:31 | Orion Poplawski | New Issue | |
2013-06-28 18:31 | Orion Poplawski | File Added: vtk-install.patch | |
2013-12-17 21:51 | Dave DeMarle | Target Version | => 6.2.0 |
2014-02-17 00:37 | Orion Poplawski | Note Added: 0032340 | |
2014-03-08 18:52 | efferre79 | Note Added: 0032460 | |
2014-03-08 18:53 | efferre79 | File Added: vtk-6.1.0.patch | |
2014-03-08 18:53 | efferre79 | File Added: paraview-4.1.0.patch | |
2014-03-08 19:07 | efferre79 | File Added: paraview-4.1.0-v2.patch | |
2014-10-02 11:02 | Berk Geveci | Project | VTK => ParaView |
2016-08-12 09:59 | Kitware Robot | Note Added: 0038417 | |
2016-08-12 09:59 | Kitware Robot | Status | backlog => closed |
2016-08-12 09:59 | Kitware Robot | Resolution | open => moved |
2016-08-12 09:59 | Kitware Robot | Assigned To | => Kitware Robot |
Issue History |
Copyright © 2000 - 2018 MantisBT Team |