tags 584300 - moreinfo + patch thanks 2011/12/8 Mathieu Malaterre <[email protected]>: > Denis, > > Do you think you can update your patch for VTK 5.8.0 ?
Hello Mathieu, Here it is. I checked that vtk builds fine, but did not try this time to use the generated packages; it should work since I did test it last time, but have no time just now to check. Denis
commit e5dd0bdc11f7cbbea5f126b5c4c99745b8733078 Author: Denis Barbier <[email protected]> Date: Fri Dec 16 12:44:10 2011 +0100 Remove information about wrapped languages from VTKConfig.cmake The file /usr/lib/vtk-5.8/VTKConfig.cmake contains configuration used when building package, in particular information about wrapped languages are hardcoded. For instance VTK_WRAP_PYTHON is always set to true even if python-vtk is not installed. This patch puts snippets about wrapped languages into separate files, which are shipped by python-vtk, tcl-vtk and libvtk-java. diff --git a/VTKConfig-Java.cmake.in b/VTKConfig-Java.cmake.in new file mode 100644 index 0000000..30f01b5 --- /dev/null +++ b/VTKConfig-Java.cmake.in @@ -0,0 +1,14 @@ +# The list of available languages. +SET(VTK_LANGUAGES ${VTK_LANGUAGES} JAVA) + +SET(VTK_WRAP_JAVA 1) + +# The Java configuration. +SET(VTK_JAVA_JAR "@VTK_JAVA_JAR_CONFIG@") +SET(VTK_PARSE_JAVA_EXE "@VTK_PARSE_JAVA_EXE_CONFIG@") +SET(VTK_WRAP_JAVA_EXE "@VTK_WRAP_JAVA_EXE_CONFIG@") +SET(VTK_JAVA_INCLUDE_DIR "@JAVA_INCLUDE_PATH@;@JAVA_INCLUDE_PATH2@") +SET(VTK_JAVA_AWT_LIBRARY "@JAVA_AWT_LIBRARY@") +SET(VTK_JVM_LIBRARY "@JAVA_JVM_LIBRARY@") + + diff --git a/VTKConfig-Python.cmake.in b/VTKConfig-Python.cmake.in new file mode 100644 index 0000000..2b4e259 --- /dev/null +++ b/VTKConfig-Python.cmake.in @@ -0,0 +1,14 @@ +# The list of available languages. +SET(VTK_LANGUAGES ${VTK_LANGUAGES} PYTHON) + +SET(VTK_WRAP_PYTHON 1) + +# The Python configuration. +# If VTK_CONFIGURATION_TYPES is set (see below) then the VTK_PYTHONPATH_DIRS +# will have subdirectories for each configuration type. +SET(VTK_PYTHONPATH_DIRS "@VTK_PYTHONPATH_DIRS_CONFIG@") +SET(VTK_WRAP_PYTHON_EXE "@VTK_WRAP_PYTHON_EXE_CONFIG@") +SET(VTK_WRAP_PYTHON_INIT_EXE "@VTK_WRAP_PYTHON_INIT_EXE_CONFIG@") +SET(VTK_PYTHON_INCLUDE_DIR "@PYTHON_INCLUDE_DIR@") +SET(VTK_PYTHON_LIBRARY "@PYTHON_LIBRARY@") + diff --git a/VTKConfig-Tcl.cmake.in b/VTKConfig-Tcl.cmake.in new file mode 100644 index 0000000..fedf000 --- /dev/null +++ b/VTKConfig-Tcl.cmake.in @@ -0,0 +1,21 @@ +# The list of available languages. +SET(VTK_LANGUAGES ${VTK_LANGUAGES} TCL) + +SET(VTK_WRAP_TCL 1) + +# The Tcl/Tk configuration. +SET(VTK_TCL_TK_STATIC "@VTK_TCL_TK_STATIC@") +SET(VTK_TCL_TK_COPY_SUPPORT_LIBRARY "@VTK_TCL_TK_COPY_SUPPORT_LIBRARY@") +SET(VTK_TCL_SUPPORT_LIBRARY_PATH "@VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG@") +SET(VTK_TK_SUPPORT_LIBRARY_PATH "@VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG@") +SET(VTK_TCL_TK_MACROS_MODULE "@VTK_TCL_TK_MACROS_MODULE_CONFIG@") +SET(VTK_TCL_HOME "@VTK_TCL_HOME_CONFIG@") +SET(VTK_WRAP_TCL_EXE "@VTK_WRAP_TCL_EXE_CONFIG@") +SET(VTK_WRAP_TCL_INIT_EXE "@VTK_WRAP_TCL_INIT_EXE_CONFIG@") +SET(VTK_TK_INTERNAL_DIR "@VTK_TK_INTERNAL_DIR_CONFIG@") +SET(VTK_TK_RESOURCES_DIR "@VTK_TK_RESOURCES_DIR_CONFIG@") +SET(VTK_TCL_INCLUDE_DIR "@TCL_INCLUDE_PATH@") +SET(VTK_TCL_LIBRARY "@TCL_LIBRARY@") +SET(VTK_TK_INCLUDE_DIR "@TK_INCLUDE_PATH@") +SET(VTK_TK_LIBRARY "@TK_LIBRARY@") + diff --git a/VTKConfig.cmake.in b/VTKConfig.cmake.in index 6aa6e77..ff52a5c 100644 --- a/VTKConfig.cmake.in +++ b/VTKConfig.cmake.in @@ -64,7 +64,7 @@ SET(VTK_CMAKE_EXTENSIONS_DIR "@VTK_CMAKE_EXTENSIONS_DIR_CONFIG@") SET(VTK_KITS "@VTK_KITS@") # The list of available languages. -SET(VTK_LANGUAGES "@VTK_LANGUAGES@") +SET(VTK_LANGUAGES "") # VTK Configuration options. SET(VTK_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@") @@ -110,10 +110,16 @@ SET(VTK_USE_VIDEO_FOR_WINDOWS "@VTK_USE_VIDEO_FOR_WINDOWS@") SET(VTK_USE_VIEWS "@VTK_USE_VIEWS@") SET(VTK_USE_VOLUMEPRO_1000 "@VTK_USE_VOLUMEPRO_1000@") SET(VTK_USE_X "@VTK_USE_X@") -SET(VTK_WRAP_JAVA "@VTK_WRAP_JAVA@") -SET(VTK_WRAP_PYTHON "@VTK_WRAP_PYTHON@") -SET(VTK_WRAP_TCL "@VTK_WRAP_TCL@") -SET(VTK_WRAP_PYTHON_SIP "@VTK_WRAP_PYTHON_SIP@") + +SET(VTK_WRAP_JAVA 0) +SET(VTK_WRAP_PYTHON 0) +SET(VTK_WRAP_TCL 0) +SET(VTK_WRAP_PYTHON_SIP 0) + +INCLUDE("${VTK_DIR}/VTKConfig-Java.cmake" OPTIONAL) +INCLUDE("${VTK_DIR}/VTKConfig-Python.cmake" OPTIONAL) +INCLUDE("${VTK_DIR}/VTKConfig-Tcl.cmake" OPTIONAL) +# Python_sip is not provided by Debian packages # The Hybrid and VolumeRendering kits are now switched with Rendering. SET(VTK_USE_HYBRID "@VTK_USE_RENDERING@") @@ -133,44 +139,11 @@ SET(VTK_MPI_SERVER_PREFLAGS "@VTK_MPI_SERVER_PREFLAGS_CONFIG@") SET(VTK_MPI_INCLUDE_DIR "@MPI_INCLUDE_PATH@") SET(VTK_MPI_LIBRARIES "@MPI_LIBRARY@;@MPI_EXTRA_LIBRARY@") -# The Tcl/Tk configuration. -SET(VTK_TCL_TK_STATIC "@VTK_TCL_TK_STATIC@") -SET(VTK_TCL_TK_COPY_SUPPORT_LIBRARY "@VTK_TCL_TK_COPY_SUPPORT_LIBRARY@") -SET(VTK_TCL_SUPPORT_LIBRARY_PATH "@VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG@") -SET(VTK_TK_SUPPORT_LIBRARY_PATH "@VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG@") -SET(VTK_TCL_TK_MACROS_MODULE "@VTK_TCL_TK_MACROS_MODULE_CONFIG@") -SET(VTK_TCL_HOME "@VTK_TCL_HOME_CONFIG@") -SET(VTK_WRAP_TCL_EXE "@VTK_WRAP_TCL_EXE_CONFIG@") -SET(VTK_WRAP_TCL_INIT_EXE "@VTK_WRAP_TCL_INIT_EXE_CONFIG@") -SET(VTK_TK_INTERNAL_DIR "@VTK_TK_INTERNAL_DIR_CONFIG@") -SET(VTK_TK_RESOURCES_DIR "@VTK_TK_RESOURCES_DIR_CONFIG@") -SET(VTK_TCL_INCLUDE_DIR "@TCL_INCLUDE_PATH@") -SET(VTK_TCL_LIBRARY "@TCL_LIBRARY@") -SET(VTK_TK_INCLUDE_DIR "@TK_INCLUDE_PATH@") -SET(VTK_TK_LIBRARY "@TK_LIBRARY@") - -# The Java configuration. -SET(VTK_JAVA_JAR "@VTK_JAVA_JAR_CONFIG@") -SET(VTK_PARSE_JAVA_EXE "@VTK_PARSE_JAVA_EXE_CONFIG@") -SET(VTK_WRAP_JAVA_EXE "@VTK_WRAP_JAVA_EXE_CONFIG@") -SET(VTK_JAVA_INCLUDE_DIR "@JAVA_INCLUDE_PATH@;@JAVA_INCLUDE_PATH2@") -SET(VTK_JAVA_AWT_LIBRARY "@JAVA_AWT_LIBRARY@") -SET(VTK_JVM_LIBRARY "@JAVA_JVM_LIBRARY@") - # The Matlab configuration. SET(VTK_MATLAB_ROOT_DIR "@MATLAB_ROOT_DIR@") SET(VTK_MATLAB_INCLUDE_DIR "@MATLAB_INCLUDE_DIR@") SET(VTK_MATLAB_LIB_DIR "@MATLAB_LIB_DIR@") -# The Python configuration. -# If VTK_CONFIGURATION_TYPES is set (see below) then the VTK_PYTHONPATH_DIRS -# will have subdirectories for each configuration type. -SET(VTK_PYTHONPATH_DIRS "@VTK_PYTHONPATH_DIRS_CONFIG@") -SET(VTK_WRAP_PYTHON_EXE "@VTK_WRAP_PYTHON_EXE_CONFIG@") -SET(VTK_WRAP_PYTHON_INIT_EXE "@VTK_WRAP_PYTHON_INIT_EXE_CONFIG@") -SET(VTK_PYTHON_INCLUDE_DIR "@PYTHON_INCLUDE_DIR@") -SET(VTK_PYTHON_LIBRARY "@PYTHON_LIBRARY@") - # Other executables SET(VTK_ENCODESTRING_EXE "@VTK_ENCODESTRING_EXE_CONFIG@") diff --git a/debian/libvtk-java.install b/debian/libvtk-java.install index d1d4bba..a410b88 100644 --- a/debian/libvtk-java.install +++ b/debian/libvtk-java.install @@ -1,5 +1,6 @@ usr/bin/vtkWrapJava usr/bin usr/bin/vtkParseJava usr/bin usr/include/vtk-5.8/vtkJavaUtil.h usr/include/vtk-5.8 +usr/lib/vtk-5.8/VTKConfig-Java.cmake usr/lib/jni/*Java.so* usr/lib/jni usr/share/java/vtk.jar usr/share/java diff --git a/debian/python-vtk.install b/debian/python-vtk.install index 043bd14..8600940 100644 --- a/debian/python-vtk.install +++ b/debian/python-vtk.install @@ -3,6 +3,7 @@ usr/bin/vtkWrapPythonInit usr/bin/vtkpython usr/lib/*Python*.so* usr/lib usr/lib/vtk-5.8/testing/*py usr/lib/vtk-5.8/testing/ +usr/lib/vtk-5.8/VTKConfig-Python.cmake usr/lib/python2.*/*-packages/* usr/bin/pvtkpython usr/bin/pvtk diff --git a/debian/tcl-vtk.install b/debian/tcl-vtk.install index 2a989df..0a1a1d0 100644 --- a/debian/tcl-vtk.install +++ b/debian/tcl-vtk.install @@ -4,5 +4,6 @@ usr/bin/vtkWrapTcl usr/bin/vtkWrapTclInit ../../Wrapping/Tcl/vtkinteraction usr/share/tcltk/tcl8.5/vtk usr/lib/vtk-5.8/testing/*tcl usr/share/tcltk/tcl8.5/vtk +usr/lib/vtk-5.8/VTKConfig-Tcl.cmake usr/lib/tcl usr/lib/vtk-5.8 usr/lib/pkgIndex.tcl usr/lib/vtk-5.8 diff --git a/vtkGenerateVTKConfig.cmake b/vtkGenerateVTKConfig.cmake index f451a2b..96ff033 100644 --- a/vtkGenerateVTKConfig.cmake +++ b/vtkGenerateVTKConfig.cmake @@ -163,6 +163,12 @@ CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in ${VTK_BINARY_DIR}/VTKConfig.cmake @ONLY IMMEDIATE) CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfigVersion.cmake.in ${VTK_BINARY_DIR}/VTKConfigVersion.cmake @ONLY IMMEDIATE) +CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Java.cmake.in + ${VTK_BINARY_DIR}/VTKConfig-Java.cmake @ONLY IMMEDIATE) +CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Python.cmake.in + ${VTK_BINARY_DIR}/VTKConfig-Python.cmake @ONLY IMMEDIATE) +CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Tcl.cmake.in + ${VTK_BINARY_DIR}/VTKConfig-Tcl.cmake @ONLY IMMEDIATE) #----------------------------------------------------------------------------- # Settings specific to the install tree. @@ -336,6 +342,15 @@ IF(CMAKE_CONFIGURATION_TYPES) CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Java.cmake.in + ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig-Java.cmake + @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Python.cmake.in + ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig-Python.cmake + @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Tcl.cmake.in + ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig-Tcl.cmake + @ONLY IMMEDIATE) ENDFOREACH(config) # Install the config file corresponding to the build configuration @@ -347,12 +362,39 @@ IF(CMAKE_CONFIGURATION_TYPES) DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} COMPONENT Development ) + IF(VTK_WRAP_JAVA) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/${DOLLAR}{BUILD_TYPE}/VTKConfig-Java.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_JAVA) + IF(VTK_WRAP_PYTHON) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/${DOLLAR}{BUILD_TYPE}/VTKConfig-Python.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_PYTHON) + IF(VTK_WRAP_TCL) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/${DOLLAR}{BUILD_TYPE}/VTKConfig-Tcl.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_TCL) ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) ELSE(CMAKE_CONFIGURATION_TYPES) # There is only one build configuration. Configure one VTKConfig.cmake. SET(VTK_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE}) CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in ${VTK_BINARY_DIR}/Utilities/VTKConfig.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Java.cmake.in + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Java.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Python.cmake.in + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Python.cmake @ONLY IMMEDIATE) + CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig-Tcl.cmake.in + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Tcl.cmake @ONLY IMMEDIATE) # Setup an install rule for the config file. IF(NOT VTK_INSTALL_NO_DEVELOPMENT) @@ -361,6 +403,27 @@ ELSE(CMAKE_CONFIGURATION_TYPES) DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} COMPONENT Development ) + IF(VTK_WRAP_JAVA) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Java.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_JAVA) + IF(VTK_WRAP_PYTHON) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Python.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_PYTHON) + IF(VTK_WRAP_TCL) + INSTALL(FILES + ${VTK_BINARY_DIR}/Utilities/VTKConfig-Tcl.cmake + DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} + COMPONENT Development + ) + ENDIF(VTK_WRAP_TCL) ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) ENDIF(CMAKE_CONFIGURATION_TYPES)
