commit 267397273d70beb29f4a44d76fddd4fe2ee2b255 Author: Denis Barbier Date: Mon May 31 23:19:25 2010 +0200 Remove information about wrapped languages from VTKConfig.cmake The file /usr/lib/vtk-5.4/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, vtk-tcl and libvtk-java. diff --git a/VTKConfig-Java.cmake.in b/VTKConfig-Java.cmake.in new file mode 100644 index 0000000..b2b7fcf --- /dev/null +++ b/VTKConfig-Java.cmake.in @@ -0,0 +1,10 @@ +# 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@") + diff --git a/VTKConfig-Python.cmake.in b/VTKConfig-Python.cmake.in new file mode 100644 index 0000000..c790a9c --- /dev/null +++ b/VTKConfig-Python.cmake.in @@ -0,0 +1,12 @@ +# 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 VTKConfig.cmake.in) 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@") + diff --git a/VTKConfig-Tcl.cmake.in b/VTKConfig-Tcl.cmake.in new file mode 100644 index 0000000..74830a3 --- /dev/null +++ b/VTKConfig-Tcl.cmake.in @@ -0,0 +1,17 @@ +# 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@") + diff --git a/VTKConfig.cmake.in b/VTKConfig.cmake.in index 3418316..15a66a2 100644 --- a/VTKConfig.cmake.in +++ b/VTKConfig.cmake.in @@ -61,7 +61,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,38 +110,19 @@ 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_JAVA 0) +SET(VTK_WRAP_PYTHON 0) +SET(VTK_WRAP_TCL 0) + +INCLUDE("${VTK_DIR}/VTKConfig-Java.cmake" OPTIONAL) +INCLUDE("${VTK_DIR}/VTKConfig-Python.cmake" OPTIONAL) +INCLUDE("${VTK_DIR}/VTKConfig-Tcl.cmake" OPTIONAL) # The Hybrid and VolumeRendering kits are now switched with Rendering. SET(VTK_USE_HYBRID "@VTK_USE_RENDERING@") SET(VTK_USE_VOLUMERENDERING "@VTK_USE_RENDERING@") -# 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@") - -# 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@") - -# 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@") - # Other executables SET(VTK_ENCODESTRING_EXE "@VTK_ENCODESTRING_EXE_CONFIG@") diff --git a/debian/libvtk-java.install b/debian/libvtk-java.install index 270ee14..9af4be0 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.4/vtkJavaUtil.h usr/include/vtk-5.4 +usr/lib/vtk-5.4/VTKConfig-Java.cmake usr/lib/vtk-5.4/*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 a313f49..ceca9d3 100644 --- a/debian/python-vtk.install +++ b/debian/python-vtk.install @@ -1,6 +1,7 @@ usr/bin/vtkWrapPython usr/bin/vtkWrapPythonInit usr/bin/vtkpython +usr/lib/vtk-5.4/VTKConfig-Python.cmake usr/lib/vtk-5.4/*Python*.so* usr/lib usr/lib/vtk-5.4/testing/*py usr/lib/vtk-5.4/testing/ usr/lib/python2.*/*-packages/* diff --git a/debian/rules b/debian/rules index 3bceb90..81ab79d 100755 --- a/debian/rules +++ b/debian/rules @@ -223,6 +223,7 @@ binary-arch: install-stamp dh_lintian -a rm -f $(CURDIR)/debian/libvtk5-dev/usr/include/vtk-5.4/vtkJavaUtil.h + rm -f $(CURDIR)/debian/libvtk5-dev/usr/lib/vtk-5.4/VTKConfig-*.cmake # find $(CURDIR)/debian/python-vtk/usr/lib/$(PYVERS)/site-packages -name \*.pyc -exec rm \{\} \; # Remove those files, to help debugging problems when binary-arch is run by hand -rm -f debian/vtk-tcl/usr/lib/vtk-5.4/*TCL.so diff --git a/debian/vtk-tcl.install b/debian/vtk-tcl.install index ee2b3c7..9f37a14 100644 --- a/debian/vtk-tcl.install +++ b/debian/vtk-tcl.install @@ -3,6 +3,7 @@ usr/bin/vtk usr/bin/vtkWrapTcl usr/bin/vtkWrapTclInit ../../Wrapping/Tcl/vtkinteraction usr/share/tcltk/tcl8.5/vtk +usr/lib/vtk-5.4/VTKConfig-Tcl.cmake usr/lib/vtk-5.4/testing/*tcl usr/share/tcltk/tcl8.5/vtk usr/lib/vtk-5.4/tcl usr/lib/vtk-5.4 usr/lib/vtk-5.4/pkgIndex.tcl usr/lib/vtk-5.4 diff --git a/vtkGenerateVTKConfig.cmake b/vtkGenerateVTKConfig.cmake index 3cf8a60..ca2bc91 100644 --- a/vtkGenerateVTKConfig.cmake +++ b/vtkGenerateVTKConfig.cmake @@ -148,6 +148,12 @@ SET(VTK_CONFIG_BACKWARD_COMPATIBILITY_HACK # Configure VTKConfig.cmake for the build tree. CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in ${VTK_BINARY_DIR}/VTKConfig.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. @@ -326,6 +332,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 @@ -337,12 +352,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) @@ -351,5 +393,26 @@ 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)