Hey everyone,
On Sun, Aug 07, 2011 at 12:35:43AM +0200, Andreas Tille wrote:
> did anybody tested the packages prepared by Michael in real life?
>
> I just tried another test but things did not changed regarding the
>
> Socket.cpp.o -c /tmp/buildd/ginkgocadx-2.5.2.0/src/cadxcore/xmlrpc/XmlRpcSocket.cpp
> make[3]: *** No rule to make target `/usr/lib/libpng.so', needed by `src/cadxcore/libCADxCore.so.2.5.2.0'. Stop.
>
> problem. So we need to keep on working / testing on this.
I’m still on it, I just don’t have as much time for it as I’d like to.
While it appears that the dirty “solution” of removing
*LibraryDepends.cmake files fixes the situation in that the reverse
build-deps don’t fail any more, the more elegant (AFAICT) approach
involves upgrading to an apparently better way to use CMake.
I am currently trying this for VTK by cherry-picking commits from the
upstream VCS. It seems to work out more or less, but it interferes with
the current Debian packaging (basically, some files end up in /usr/lib
while the build system expects them in /usr/lib/vtk-5.6). In an hour or
so, I’ll know whether I managed to fix this. I currently have to do
another full build because apparently ccache didn’t catch on the first
time (the fix for #522641, I guess).
If someone wants to have a look, I have attached a patch yielding my
current playground; it applies cleanly to the collab-maint vtk repo as
of today. Relevant upstream commits are
fd40541c9555b2a220f35151f2a74afdc65bc574
04982a2fdb5bf37d957bba98542afe5919dd2a2a
abb812ba3978327dc52971016c462e115fe84f8a
d738ac139ca27a8113531841656b9e9a43ae55b5
d7aedaf0617c3862d454f78302a792f6670728f0
a9cca6016701e6082cfa0a995ec447c9d4ccf83b
6f9088c99e8d46f8d0ca163cb034456b5eb13d99
e764652a0e6313f5d8c16297acfdef7e2eb78910
ITK probably needs similar changes, but I haven’t looked at the
exact situation there.
Cheers,
--
Michael Schutte | michi@{uiae.at,debian.org}
Innsbruck, Austria | happily accepting encrypted mail
OpenPGP: 0x16fb 517b a866 c3f6 8f11 1485 f3e4 122f 1D8C 261A
diff --git a/CMake/KitCommonBlock.cmake b/CMake/KitCommonBlock.cmake
index ce536e2..2ef4e11 100644
--- a/CMake/KitCommonBlock.cmake
+++ b/CMake/KitCommonBlock.cmake
@@ -4,7 +4,7 @@ VTK_MAKE_INSTANTIATOR3(vtk${KIT}Instantiator KitInstantiator_SRCS
VTK_${UKIT}_EXPORT
${VTK_BINARY_DIR} "")
-ADD_LIBRARY(vtk${KIT} ${Kit_SRCS} ${Kit_EXTRA_SRCS} ${KitInstantiator_SRCS})
+VTK_ADD_LIBRARY(vtk${KIT} ${Kit_SRCS} ${Kit_EXTRA_SRCS} ${KitInstantiator_SRCS})
SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT})
# Add target specific compile flags for ABI setttings
IF(VTK_ABI_CXX_FLAGS)
@@ -43,6 +43,7 @@ TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_INTERFACE_LIBRARIES} ${KIT_LIBS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtk${KIT}
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/CMake/KitCommonJavaWrapBlock.cmake b/CMake/KitCommonJavaWrapBlock.cmake
index 702180b..354f32d 100644
--- a/CMake/KitCommonJavaWrapBlock.cmake
+++ b/CMake/KitCommonJavaWrapBlock.cmake
@@ -1,9 +1,10 @@
VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS};${Kit_JAVA_EXTRA_WRAP_SRCS}")
-ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
+VTK_ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}Java)
TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtk${KIT}Java
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/CMake/KitCommonPythonWrapBlock.cmake b/CMake/KitCommonPythonWrapBlock.cmake
index 1a0b77a..a3da59d 100644
--- a/CMake/KitCommonPythonWrapBlock.cmake
+++ b/CMake/KitCommonPythonWrapBlock.cmake
@@ -4,10 +4,11 @@ VTK_WRAP_PYTHON3(vtk${KIT}Python KitPython_SRCS "${Kit_SRCS}")
# Create a shared library containing the python wrappers. Executables
# can link to this but it is not directly loaded dynamically as a
# module.
-ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
+VTK_ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtk${KIT}PythonD
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
@@ -73,6 +74,7 @@ IF(PYTHON_ENABLE_MODULE_vtk${KIT}Python)
# module at the same location as other libraries.
IF (VTK_INSTALL_PYTHON_USING_CMAKE AND NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtk${KIT}Python
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/CMake/KitCommonTclWrapBlock.cmake b/CMake/KitCommonTclWrapBlock.cmake
index 1d950ac..b0a5723 100644
--- a/CMake/KitCommonTclWrapBlock.cmake
+++ b/CMake/KitCommonTclWrapBlock.cmake
@@ -1,7 +1,7 @@
VTK_WRAP_TCL3(vtk${KIT}TCL KitTCL_SRCS
"${Kit_SRCS}"
"${Kit_TCL_EXTRA_CMDS}")
-ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
+VTK_ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}TCL)
TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
@@ -14,6 +14,7 @@ TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtk${KIT}TCL
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/CMake/vtkTargetExportMacros.cmake b/CMake/vtkTargetExportMacros.cmake
new file mode 100644
index 0000000..770b745
--- /dev/null
+++ b/CMake/vtkTargetExportMacros.cmake
@@ -0,0 +1,13 @@
+if(NOT VTK_INSTALL_EXPORT_NAME)
+ set(VTK_INSTALL_EXPORT_NAME VTKTargets)
+endif()
+
+MACRO(VTK_ADD_LIBRARY name)
+ ADD_LIBRARY(${name} ${ARGN})
+ SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS ${name})
+ENDMACRO(VTK_ADD_LIBRARY)
+
+MACRO(VTK_ADD_EXECUTABLE name)
+ ADD_EXECUTABLE(${name} ${ARGN})
+ SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS ${name})
+ENDMACRO(VTK_ADD_EXECUTABLE)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 766b98d..96b87df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,8 @@ IF(NOT VTK_NO_LIBRARY_VERSION)
)
ENDIF(NOT VTK_NO_LIBRARY_VERSION)
+INCLUDE(vtkTargetExportMacros)
+
#-----------------------------------------------------------------------------
# Determine whether we are being built by CTest and if so the version.
# For CTest 2.2 and higher this will contain the version number. For
@@ -593,6 +595,7 @@ SET(KWSYS_USE_Glob 1)
SET(KWSYS_USE_DateStamp 1)
SET(KWSYS_HEADER_ROOT ${VTK_BINARY_DIR}/Utilities)
SET(KWSYS_PROPERTIES_CXX ${VTK_LIBRARY_PROPERTIES})
+SET(KWSYS_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
IF(NOT VTK_USE_ANSI_STDLIB)
SET(KWSYS_IOS_FORCE_OLD 1)
@@ -1390,9 +1393,6 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-# Save library dependencies.
-EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake)
-
# Install some files.
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
@@ -1423,8 +1423,7 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
COMPONENT Development)
SET(__inst_files
- ${VTK_BINARY_DIR}/UseVTK.cmake
- ${VTK_BINARY_DIR}/VTKLibraryDepends.cmake)
+ ${VTK_BINARY_DIR}/UseVTK.cmake)
IF(VTK_WRAP_HINTS)
SET(__inst_files ${__inst_files} ${VTK_WRAP_HINTS})
ENDIF(VTK_WRAP_HINTS)
diff --git a/GUISupport/MFC/CMakeLists.txt b/GUISupport/MFC/CMakeLists.txt
index 9486faa..1317267 100644
--- a/GUISupport/MFC/CMakeLists.txt
+++ b/GUISupport/MFC/CMakeLists.txt
@@ -17,7 +17,7 @@ SET(MFC_SRCS
vtkMFCWindow.cpp
)
-ADD_LIBRARY(vtkMFC ${VTK_MFC_LIB_TYPE} ${MFC_SRCS})
+VTK_ADD_LIBRARY(vtkMFC ${VTK_MFC_LIB_TYPE} ${MFC_SRCS})
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
@@ -42,6 +42,7 @@ IF ( WIN32 )
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkMFC
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries # .exe, .dll
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development # .a, .lib
diff --git a/GUISupport/MFC/VTKMFCSettings.cmake b/GUISupport/MFC/VTKMFCSettings.cmake
index 51854df..01fb0a6 100644
--- a/GUISupport/MFC/VTKMFCSettings.cmake
+++ b/GUISupport/MFC/VTKMFCSettings.cmake
@@ -1,5 +1,5 @@
# Include this file from a CMakeLists.txt that contains an
-# ADD_EXECUTABLE or ADD_LIBRARY call when the build product
+# VTK_ADD_EXECUTABLE or VTK_ADD_LIBRARY call when the build product
# links against MFC.
#
# This file provides definitions for the following CMake vars:
diff --git a/GUISupport/Qt/CMakeLists.txt b/GUISupport/Qt/CMakeLists.txt
index 01bd96e..c06a50a 100644
--- a/GUISupport/Qt/CMakeLists.txt
+++ b/GUISupport/Qt/CMakeLists.txt
@@ -124,7 +124,7 @@ QT4_WRAP_CPP ( QVTKLibMocSrcs ${QVTKMocHeaders} )
SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${include_dirs_tmp}")
-ADD_LIBRARY(QVTK ${QVTKLibSrcs} ${QVTKLibMocSrcs})
+VTK_ADD_LIBRARY(QVTK ${QVTKLibSrcs} ${QVTKLibMocSrcs})
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
@@ -169,7 +169,7 @@ QT4_WRAP_CPP ( PluginMocSrcs ${PluginMocHeaders} )
# add QVTK plugin from sources
# stand-alone as it doesn't depend on QVTK library
-ADD_LIBRARY ( QVTKWidgetPlugin
+VTK_ADD_LIBRARY ( QVTKWidgetPlugin
SHARED
${PluginLibSrcs}
${PluginMocSrcs}
@@ -241,6 +241,7 @@ ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS QVTK
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/GUISupport/Qt/Chart/CMakeLists.txt b/GUISupport/Qt/Chart/CMakeLists.txt
index d2c3b0e..db73099 100644
--- a/GUISupport/Qt/Chart/CMakeLists.txt
+++ b/GUISupport/Qt/Chart/CMakeLists.txt
@@ -300,7 +300,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${include_dirs_tmp}")
"${CMAKE_CURRENT_BINARY_DIR}/vtkQtChartExport.h"
)
- ADD_LIBRARY(vtkQtChart
+ VTK_ADD_LIBRARY(vtkQtChart
${vtkQtChart_SOURCES}
${vtkQtChart_HEADERS}
${vtkQtChart_MOC_SOURCES}
@@ -322,6 +322,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${include_dirs_tmp}")
IF(NOT VTK_INSTALL_NO_LIBRARIES AND VTK_INSTALL_BIN_DIR_CM24 AND VTK_INSTALL_LIB_DIR_CM24)
INSTALL(TARGETS vtkQtChart
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Rendering/CMakeLists.txt b/Rendering/CMakeLists.txt
index b49ad71..aa464dd 100644
--- a/Rendering/CMakeLists.txt
+++ b/Rendering/CMakeLists.txt
@@ -802,7 +802,7 @@ IF (VTK_WRAP_PYTHON AND VTK_USE_TK AND TK_FOUND)
vtkCocoaTkUtilities.mm)
ENDIF (VTK_USE_COCOA)
- ADD_LIBRARY(vtkRenderingPythonTkWidgets SHARED
+ VTK_ADD_LIBRARY(vtkRenderingPythonTkWidgets SHARED
${RenderingPythonTkWidgets_SRCS})
SET(VTK_PYTHONTK_LIBRARIES ${VTK_TK_LIBRARIES})
IF(VTK_USE_X)
@@ -824,6 +824,7 @@ IF (VTK_WRAP_PYTHON AND VTK_USE_TK AND TK_FOUND)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkRenderingPythonTkWidgets
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/UseVTK.cmake.in b/UseVTK.cmake.in
index b79a99e..b40bec2 100644
--- a/UseVTK.cmake.in
+++ b/UseVTK.cmake.in
@@ -23,9 +23,6 @@ IF(NOT VTK_USE_FILE_INCLUDED)
# Add include directories needed to use VTK.
INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
- # Add link directories needed to use VTK.
- LINK_DIRECTORIES(${VTK_LIBRARY_DIRS})
-
# Import the VTK_LOAD_CMAKE_EXTENSIONS macro.
INCLUDE(${VTK_CMAKE_DIR}/vtkMakeInstantiator.cmake)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 7df4105..a89d90d 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -1,5 +1,6 @@
# Build kwsys
SUBDIRS(kwsys)
+SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtksys)
# Build third-party utilities.
@@ -39,6 +40,7 @@ SUBDIRS(verdict)
IF(VTK_USE_METAIO)
SUBDIRS(vtkmetaio)
+ SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio)
ENDIF(VTK_USE_METAIO)
SUBDIRS(vtksqlite)
diff --git a/Utilities/Cosmo/CMakeLists.txt b/Utilities/Cosmo/CMakeLists.txt
index a3d40a8..6a53c9a 100644
--- a/Utilities/Cosmo/CMakeLists.txt
+++ b/Utilities/Cosmo/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(Cosmo_SOURCES
INCLUDE_DIRECTORIES (${Cosmo_SOURCE_DIR} ${Cosmo_BINARY_DIR})
-ADD_LIBRARY(Cosmo ${Cosmo_SOURCES})
+VTK_ADD_LIBRARY(Cosmo ${Cosmo_SOURCES})
TARGET_LINK_LIBRARIES(Cosmo vtksys vtkCommon ${Cosmo_LIBS})
# Apply user-defined properties to the library targets.
@@ -44,6 +44,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS Cosmo
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/DICOMParser/CMakeLists.txt b/Utilities/DICOMParser/CMakeLists.txt
index a9d40aa..4c6cf6c 100755
--- a/Utilities/DICOMParser/CMakeLists.txt
+++ b/Utilities/DICOMParser/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(DICOM_NO_STD_NAMESPACE ${CMAKE_NO_STD_NAMESPACE})
CONFIGURE_FILE(${DICOMParser_SOURCE_DIR}/DICOMCMakeConfig.h.in
${DICOMParser_BINARY_DIR}/DICOMCMakeConfig.h)
-ADD_LIBRARY(vtkDICOMParser DICOMFile.cxx DICOMParser.cxx DICOMAppHelper.cxx)
+VTK_ADD_LIBRARY(vtkDICOMParser DICOMFile.cxx DICOMParser.cxx DICOMAppHelper.cxx)
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
@@ -35,6 +35,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkDICOMParser
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/EncodeString/CMakeLists.txt b/Utilities/EncodeString/CMakeLists.txt
index 368f4e6..fd694e7 100644
--- a/Utilities/EncodeString/CMakeLists.txt
+++ b/Utilities/EncodeString/CMakeLists.txt
@@ -8,13 +8,14 @@
#
IF(NOT CMAKE_CROSSCOMPILING)
- ADD_EXECUTABLE(vtkEncodeString vtkEncodeString.cxx)
+ VTK_ADD_EXECUTABLE(vtkEncodeString vtkEncodeString.cxx)
EXPORT(TARGETS vtkEncodeString FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
IF(COMPILE_TOOLS_TARGET)
ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} vtkEncodeString)
ENDIF(COMPILE_TOOLS_TARGET)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL(TARGETS vtkEncodeString
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/LastConfigureStep/CMakeLists.txt b/Utilities/LastConfigureStep/CMakeLists.txt
index 51cf297..e17f5f7 100644
--- a/Utilities/LastConfigureStep/CMakeLists.txt
+++ b/Utilities/LastConfigureStep/CMakeLists.txt
@@ -9,6 +9,11 @@
# are configured in SUBDIRS.
#-----------------------------------------------------------------------------
+GET_PROPERTY(VTK_TARGETS GLOBAL PROPERTY VTK_TARGETS)
+EXPORT(TARGETS ${VTK_TARGETS} FILE ${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake)
+INSTALL(EXPORT ${VTK_INSTALL_EXPORT_NAME} DESTINATION ${VTK_INSTALL_LIB_DIR_CM24})
+
+#-----------------------------------------------------------------------------
# Create the VTKConfig.cmake file containing the VTK configuration.
# Since it might generate configuration file depending
INCLUDE(${VTK_SOURCE_DIR}/vtkGenerateVTKConfig.cmake)
diff --git a/Utilities/VPIC/CMakeLists.txt b/Utilities/VPIC/CMakeLists.txt
index 32d1a44..98ba611 100644
--- a/Utilities/VPIC/CMakeLists.txt
+++ b/Utilities/VPIC/CMakeLists.txt
@@ -22,7 +22,7 @@ ENDIF(VTK_USE_MPI)
INCLUDE_DIRECTORIES (${VPIC_SOURCE_DIR} ${VPIC_BINARY_DIR})
-ADD_LIBRARY(VPIC ${VPIC_SOURCES})
+VTK_ADD_LIBRARY(VPIC ${VPIC_SOURCES})
TARGET_LINK_LIBRARIES(VPIC vtksys )
# Apply user-defined properties to the library targets.
@@ -41,6 +41,7 @@ ENDIF(VTK_USE_MPI)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS VPIC
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/ftgl/CMakeLists.txt b/Utilities/ftgl/CMakeLists.txt
index 08e469c..ade8d18 100644
--- a/Utilities/ftgl/CMakeLists.txt
+++ b/Utilities/ftgl/CMakeLists.txt
@@ -144,7 +144,7 @@ SET (VTKFTGL_LIBS "${VTKFTGL_LIBS};${VTK_FREETYPE_LIBRARIES}")
#
# Define the library (and install it)
#
-ADD_LIBRARY (vtkftgl ${FTGL_SRCS})
+VTK_ADD_LIBRARY (vtkftgl ${FTGL_SRCS})
TARGET_LINK_LIBRARIES(vtkftgl ${VTKFTGL_LIBS})
# Apply user-defined properties to the library target.
@@ -154,6 +154,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkftgl
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/kwsys/CMakeLists.txt b/Utilities/kwsys/CMakeLists.txt
index 62042e8..3c385fb 100644
--- a/Utilities/kwsys/CMakeLists.txt
+++ b/Utilities/kwsys/CMakeLists.txt
@@ -61,6 +61,8 @@
# If not given the install rules
# will not be in any component.
#
+# KWSYS_INSTALL_EXPORT_NAME = The EXPORT option value for install(TARGETS) calls.
+#
# Example:
#
# SET(KWSYS_INSTALL_BIN_DIR bin)
@@ -241,6 +243,9 @@ IF(COMMAND INSTALL)
# Setup library install rules.
SET(KWSYS_INSTALL_LIBRARY_RULE)
+ IF(KWSYS_INSTALL_EXPORT_NAME)
+ LIST(APPEND KWSYS_INSTALL_LIBRARY_RULE EXPORT ${KWSYS_INSTALL_EXPORT_NAME})
+ ENDIF()
IF(KWSYS_INSTALL_LIB_DIR)
# Install the shared library to the lib directory.
SET(KWSYS_INSTALL_LIBRARY_RULE ${KWSYS_INSTALL_LIBRARY_RULE}
diff --git a/Utilities/mrmpi/mpistubs/CMakeLists.txt b/Utilities/mrmpi/mpistubs/CMakeLists.txt
index 84bc937..19841a7 100644
--- a/Utilities/mrmpi/mpistubs/CMakeLists.txt
+++ b/Utilities/mrmpi/mpistubs/CMakeLists.txt
@@ -1,6 +1,6 @@
SET (mpistubs_SOURCES mpi.cpp)
-ADD_LIBRARY (mpistubs ${mpistubs_SOURCES})
+VTK_ADD_LIBRARY (mpistubs ${mpistubs_SOURCES})
TARGET_LINK_LIBRARIES (mpistubs vtksys)
IF(VTK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(mpistubs PROPERTIES ${VTK_LIBRARY_PROPERTIES})
@@ -8,6 +8,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS mpistubs
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/mrmpi/src/CMakeLists.txt b/Utilities/mrmpi/src/CMakeLists.txt
index 191c86a..9503abe 100644
--- a/Utilities/mrmpi/src/CMakeLists.txt
+++ b/Utilities/mrmpi/src/CMakeLists.txt
@@ -7,7 +7,7 @@ SET (mrmpi_SOURCES
memory.cpp
error.cpp)
-ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES})
+VTK_ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES})
TARGET_LINK_LIBRARIES (MapReduceMPI ${mrmpi_LIBS})
IF(VTK_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(MapReduceMPI PROPERTIES ${VTK_LIBRARY_PROPERTIES})
@@ -15,6 +15,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS MapReduceMPI
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/verdict/CMakeLists.txt b/Utilities/verdict/CMakeLists.txt
index 792ea54..7fccf3f 100644
--- a/Utilities/verdict/CMakeLists.txt
+++ b/Utilities/verdict/CMakeLists.txt
@@ -75,7 +75,7 @@ if ( NOT VERDICT_NO_LIBRARY_VERSION )
)
endif ( NOT VERDICT_NO_LIBRARY_VERSION )
-add_library( ${verdict_LIBRARY} ${verdict_SRCS} )
+vtk_add_library( ${verdict_LIBRARY} ${verdict_SRCS} )
# Apply user-defined properties to the library targets.
if ( VERDICT_LIBRARY_PROPERTIES )
set_target_properties( ${verdict_LIBRARY}
@@ -159,6 +159,7 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
install(TARGETS ${verdict_LIBRARY}
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${verdict_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries # .exe, .dll
LIBRARY DESTINATION ${verdict_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${verdict_INSTALL_LIB_DIR} COMPONENT Development # .a, .lib
diff --git a/Utilities/vtkalglib/CMakeLists.txt b/Utilities/vtkalglib/CMakeLists.txt
index ab7c018..15b7ea1 100644
--- a/Utilities/vtkalglib/CMakeLists.txt
+++ b/Utilities/vtkalglib/CMakeLists.txt
@@ -33,7 +33,7 @@ include_directories(
${alglib_BINARY_DIR}
)
-add_library( vtkalglib
+vtk_add_library( vtkalglib
${ALGLIB_SRCS}
)
@@ -68,6 +68,7 @@ endif ( VTK_INSTALL_INCLUDE_DIR_CM24 )
# Library:
if ( NOT VTK_INSTALL_NO_LIBRARIES )
install( TARGETS vtkalglib
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${alglib_install_bin_dir} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${alglib_install_lib_dir} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${alglib_install_lib_dir} COMPONENT Development
diff --git a/Utilities/vtkexodus2/CMakeLists.txt b/Utilities/vtkexodus2/CMakeLists.txt
index f02bf97..6684c41 100755
--- a/Utilities/vtkexodus2/CMakeLists.txt
+++ b/Utilities/vtkexodus2/CMakeLists.txt
@@ -212,7 +212,7 @@ IF(APPLE)
ENDIF(APPLE)
-ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
+VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
# Apply user-defined properties to the library target.
@@ -222,6 +222,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkexoIIc
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtkexpat/CMakeLists.txt b/Utilities/vtkexpat/CMakeLists.txt
index 22d4dfc..a518777 100644
--- a/Utilities/vtkexpat/CMakeLists.txt
+++ b/Utilities/vtkexpat/CMakeLists.txt
@@ -22,7 +22,7 @@ CONFIGURE_FILE(${VTKEXPAT_SOURCE_DIR}/expatDllConfig.h.in
CONFIGURE_FILE(${VTKEXPAT_SOURCE_DIR}/.NoDartCoverage
${VTKEXPAT_BINARY_DIR}/.NoDartCoverage)
-ADD_LIBRARY(vtkexpat ${expat_SRCS})
+VTK_ADD_LIBRARY(vtkexpat ${expat_SRCS})
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
@@ -31,6 +31,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkexpat
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtkfreetype/CMakeLists.txt b/Utilities/vtkfreetype/CMakeLists.txt
index 58a726b..44f9d7c 100644
--- a/Utilities/vtkfreetype/CMakeLists.txt
+++ b/Utilities/vtkfreetype/CMakeLists.txt
@@ -99,7 +99,7 @@ ENDIF (APPLE AND NOT VTK_USE_X)
#
# Define the library (and install it)
#
-ADD_LIBRARY (vtkfreetype ${FREETYPE_SRCS})
+VTK_ADD_LIBRARY (vtkfreetype ${FREETYPE_SRCS})
#
# If we want freetype's Mac font support we need to link against
@@ -116,6 +116,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkfreetype
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtkjpeg/CMakeLists.txt b/Utilities/vtkjpeg/CMakeLists.txt
index 9c87fcf..a656add 100644
--- a/Utilities/vtkjpeg/CMakeLists.txt
+++ b/Utilities/vtkjpeg/CMakeLists.txt
@@ -45,7 +45,7 @@ CONFIGURE_FILE(${VTKJPEG_SOURCE_DIR}/.NoDartCoverage
CONFIGURE_FILE(${VTKJPEG_SOURCE_DIR}/jpegDllConfig.h.in
${VTKJPEG_BINARY_DIR}/jpegDllConfig.h)
-ADD_LIBRARY(vtkjpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
+VTK_ADD_LIBRARY(vtkjpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
@@ -54,6 +54,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkjpeg
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtklibproj4/CMakeLists.txt b/Utilities/vtklibproj4/CMakeLists.txt
index fb473f8..c6fe9c6 100644
--- a/Utilities/vtklibproj4/CMakeLists.txt
+++ b/Utilities/vtklibproj4/CMakeLists.txt
@@ -180,7 +180,7 @@ set( LP4_SRCS
#------------------------------------------------------------------------------
# Executable and library targets
-add_library( vtkproj4
+vtk_add_library( vtkproj4
${LP4_SRCS}
)
@@ -231,7 +231,8 @@ endif(VTK_LIBRARY_PROPERTIES)
# Install targets
IF(NOT VTK_INSTALL_NO_LIBRARIES)
- INSTALL(TARGETS vtkproj4 lproj
+ INSTALL(TARGETS vtkproj4
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtklibxml2/CMakeLists.txt b/Utilities/vtklibxml2/CMakeLists.txt
index 82e623b..6f7ac55 100644
--- a/Utilities/vtklibxml2/CMakeLists.txt
+++ b/Utilities/vtklibxml2/CMakeLists.txt
@@ -295,7 +295,7 @@ INCLUDE_DIRECTORIES(BEFORE ${vtklibxml2_BINARY_DIR})
IF(NOT BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DLIBXML_STATIC)
ENDIF(NOT BUILD_SHARED_LIBS)
-ADD_LIBRARY(vtklibxml2 ${vtklibxml2_la_SOURCES})
+VTK_ADD_LIBRARY(vtklibxml2 ${vtklibxml2_la_SOURCES})
TARGET_LINK_LIBRARIES(vtklibxml2 ${LIBXML2_LIBS})
# Apply user-defined properties to the library target.
@@ -305,6 +305,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtklibxml2
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtkmetaio/CMakeLists.txt b/Utilities/vtkmetaio/CMakeLists.txt
index 065cac2..6b9832c 100644
--- a/Utilities/vtkmetaio/CMakeLists.txt
+++ b/Utilities/vtkmetaio/CMakeLists.txt
@@ -101,7 +101,14 @@ ENDIF(WIN32)
IF(METAIO_FOR_VTK)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
+ SET(VTK_INSTALL_RULE_ARGS)
+
+ IF(VTK_INSTALL_EXPORT_NAME)
+ LIST(APPEND VTK_INSTALL_RULE_ARGS EXPORT ${VTK_INSTALL_EXPORT_NAME})
+ ENDIF(VTK_INSTALL_EXPORT_NAME)
+
INSTALL(TARGETS ${METAIO_NAMESPACE}
+ ${VTK_INSTALL_RULE_ARGS}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24}
COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24}
diff --git a/Utilities/vtkoggtheora/CMakeLists.txt b/Utilities/vtkoggtheora/CMakeLists.txt
index b455c38..3492be1 100644
--- a/Utilities/vtkoggtheora/CMakeLists.txt
+++ b/Utilities/vtkoggtheora/CMakeLists.txt
@@ -248,7 +248,7 @@ ENDIF(MSVC)
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-ADD_LIBRARY(vtkoggtheora ${VTKOGGTHEORA_SRCS})
+VTK_ADD_LIBRARY(vtkoggtheora ${VTKOGGTHEORA_SRCS})
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
@@ -258,6 +258,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkoggtheora
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtkpng/CMakeLists.txt b/Utilities/vtkpng/CMakeLists.txt
index b6c3f78..4b8516e 100644
--- a/Utilities/vtkpng/CMakeLists.txt
+++ b/Utilities/vtkpng/CMakeLists.txt
@@ -25,7 +25,7 @@ CONFIGURE_FILE(${VTKPNG_SOURCE_DIR}/.NoDartCoverage
CONFIGURE_FILE(${VTKPNG_SOURCE_DIR}/pngDllConfig.h.in
${VTKPNG_BINARY_DIR}/pngDllConfig.h)
-ADD_LIBRARY(vtkpng ${PNG_SRCS})
+VTK_ADD_LIBRARY(vtkpng ${PNG_SRCS})
TARGET_LINK_LIBRARIES(vtkpng ${VTK_ZLIB_LIBRARIES})
@@ -41,6 +41,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkpng
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtksqlite/CMakeLists.txt b/Utilities/vtksqlite/CMakeLists.txt
index a3765f8..fbab6a0 100644
--- a/Utilities/vtksqlite/CMakeLists.txt
+++ b/Utilities/vtksqlite/CMakeLists.txt
@@ -27,14 +27,14 @@ INCLUDE_DIRECTORIES( ${VTKSNL_SOURCE_DIR}/Utilities/vtksqlite )
# Windows.
IF (WIN32)
- ADD_LIBRARY( vtksqlite STATIC ${SQLite_SRCS} )
+ VTK_ADD_LIBRARY( vtksqlite STATIC ${SQLite_SRCS} )
ELSE (WIN32)
INCLUDE(CheckIncludeFiles)
CHECK_INCLUDE_FILES("pthread.h" HAVE_PTHREAD_H)
IF(HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
ADD_DEFINITIONS(-DHAVE_PTHREAD_H)
ENDIF(HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
- ADD_LIBRARY( vtksqlite ${SQLite_SRCS} )
+ VTK_ADD_LIBRARY( vtksqlite ${SQLite_SRCS} )
IF (UNIX AND HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
TARGET_LINK_LIBRARIES(vtksqlite ${CMAKE_THREAD_LIBS})
ENDIF (UNIX AND HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
@@ -46,6 +46,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtksqlite
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtktiff/CMakeLists.txt b/Utilities/vtktiff/CMakeLists.txt
index d88508f..5741e69 100644
--- a/Utilities/vtktiff/CMakeLists.txt
+++ b/Utilities/vtktiff/CMakeLists.txt
@@ -117,7 +117,7 @@ CONFIGURE_FILE(${VTKTIFF_SOURCE_DIR}/tiffDllConfig.h.in
CONFIGURE_FILE(${VTKTIFF_SOURCE_DIR}/tif_config.h.in
${VTKTIFF_BINARY_DIR}/tif_config.h)
-ADD_LIBRARY(vtktiff ${common_SRCS})
+VTK_ADD_LIBRARY(vtktiff ${common_SRCS})
TARGET_LINK_LIBRARIES( vtktiff ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES} )
# link against the math library
@@ -132,6 +132,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtktiff
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/vtkzlib/CMakeLists.txt b/Utilities/vtkzlib/CMakeLists.txt
index a5f958f..24760cc 100644
--- a/Utilities/vtkzlib/CMakeLists.txt
+++ b/Utilities/vtkzlib/CMakeLists.txt
@@ -29,7 +29,7 @@ CONFIGURE_FILE(${VTKZLIB_SOURCE_DIR}/zlibDllConfig.h.in
${VTKZLIB_BINARY_DIR}/zlibDllConfig.h)
-ADD_LIBRARY(vtkzlib ${ZLIB_SRCS})
+VTK_ADD_LIBRARY(vtkzlib ${ZLIB_SRCS})
# Apply user-defined properties to the library target.
IF(VTK_LIBRARY_PROPERTIES)
@@ -38,6 +38,7 @@ ENDIF(VTK_LIBRARY_PROPERTIES)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS vtkzlib
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/VTKConfig.cmake.in b/VTKConfig.cmake.in
index da9d1bf..18846d2 100644
--- a/VTKConfig.cmake.in
+++ b/VTKConfig.cmake.in
@@ -201,10 +201,11 @@ SET(VTK_INSTALL_PACKAGE_DIR "@VTK_INSTALL_PACKAGE_DIR@")
SET(VTK_CONFIGURATION_TYPES @VTK_CONFIGURATION_TYPES_CONFIG@)
SET(VTK_BUILD_TYPE @VTK_BUILD_TYPE_CONFIG@)
-# The VTK library dependencies.
-IF(NOT VTK_NO_LIBRARY_DEPENDS AND EXISTS "@VTK_LIBRARY_DEPENDS_FILE@")
- INCLUDE("@VTK_LIBRARY_DEPENDS_FILE@")
-ENDIF(NOT VTK_NO_LIBRARY_DEPENDS AND EXISTS "@VTK_LIBRARY_DEPENDS_FILE@")
+# The VTK targets file.
+IF(NOT VTK_INSTALL_EXPORT_NAME AND NOT TARGET vtkCommon
+ AND EXISTS "@VTK_TARGETS_FILE@")
+ INCLUDE("@VTK_TARGETS_FILE@")
+ENDIF()
# The old, less clear name for VTK_RUNTIME_LIBRARY_DIRS. Kept here
# for compatibility.
diff --git a/Wrapping/CMakeLists.txt b/Wrapping/CMakeLists.txt
index 71d0ba0..4d4d24f 100644
--- a/Wrapping/CMakeLists.txt
+++ b/Wrapping/CMakeLists.txt
@@ -14,22 +14,23 @@ IF(NOT CMAKE_CROSSCOMPILING)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
IF (VTK_WRAP_TCL)
- ADD_EXECUTABLE(vtkWrapTcl vtkWrapTcl.c vtkParse.tab.c)
- ADD_EXECUTABLE(vtkWrapTclInit vtkWrapTclInit.c)
+ VTK_ADD_EXECUTABLE(vtkWrapTcl vtkWrapTcl.c vtkParse.tab.c)
+ VTK_ADD_EXECUTABLE(vtkWrapTclInit vtkWrapTclInit.c)
EXPORT(TARGETS vtkWrapTcl vtkWrapTclInit FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
IF(COMPILE_TOOLS_TARGET)
ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} vtkWrapTcl vtkWrapTclInit)
ENDIF(COMPILE_TOOLS_TARGET)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL(TARGETS vtkWrapTcl vtkWrapTclInit
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF (VTK_WRAP_TCL)
IF (VTK_WRAP_PYTHON)
- ADD_EXECUTABLE(vtkWrapPython vtkWrapPython.c vtkParse.tab.c)
- ADD_EXECUTABLE(vtkWrapPythonInit vtkWrapPythonInit.c)
+ VTK_ADD_EXECUTABLE(vtkWrapPython vtkWrapPython.c vtkParse.tab.c)
+ VTK_ADD_EXECUTABLE(vtkWrapPythonInit vtkWrapPythonInit.c)
TARGET_LINK_LIBRARIES(vtkWrapPython ${VTK_PYTHON_LIBRARIES})
EXPORT(TARGETS vtkWrapPython vtkWrapPythonInit FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
IF(COMPILE_TOOLS_TARGET)
@@ -37,20 +38,22 @@ IF(NOT CMAKE_CROSSCOMPILING)
ENDIF(COMPILE_TOOLS_TARGET)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL(TARGETS vtkWrapPython vtkWrapPythonInit
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDIF (VTK_WRAP_PYTHON)
IF (VTK_WRAP_JAVA)
- ADD_EXECUTABLE(vtkParseJava vtkParseJava.c vtkParse.tab.c)
- ADD_EXECUTABLE(vtkWrapJava vtkWrapJava.c vtkParse.tab.c)
+ VTK_ADD_EXECUTABLE(vtkParseJava vtkParseJava.c vtkParse.tab.c)
+ VTK_ADD_EXECUTABLE(vtkWrapJava vtkWrapJava.c vtkParse.tab.c)
EXPORT(TARGETS vtkParseJava vtkWrapJava FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
IF(COMPILE_TOOLS_TARGET)
ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} vtkParseJava vtkWrapJava)
ENDIF(COMPILE_TOOLS_TARGET)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL(TARGETS vtkParseJava vtkWrapJava
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt
index 56b4b7c..2d5f05f 100644
--- a/Wrapping/Python/CMakeLists.txt
+++ b/Wrapping/Python/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}")
CONFIGURE_FILE(${VTK_SOURCE_DIR}/Wrapping/Python/vtkPythonAppInitConfigure.h.in
${VTK_BINARY_DIR}/Wrapping/Python/vtkPythonAppInitConfigure.h)
-ADD_EXECUTABLE(vtkpython vtkPythonAppInit.cxx)
+VTK_ADD_EXECUTABLE(vtkpython vtkPythonAppInit.cxx)
SET(VTKPYTHON_LINK_FLAGS)
SET(VTKPYTHON_LINK_LIBS)
@@ -218,7 +218,7 @@ IF (VTK_USE_PARALLEL AND VTK_USE_MPI)
ADD_DEFINITIONS("-DMPICH_IGNORE_CXX_SEEK")
SET(PVTKPYTHON_EXECUTABLE pvtkpython)
- ADD_EXECUTABLE(pvtkpython vtkParaPythonAppInit.cxx)
+ VTK_ADD_EXECUTABLE(pvtkpython vtkParaPythonAppInit.cxx)
TARGET_LINK_LIBRARIES(pvtkpython ${VTKPYTHON_LINK_LIBS} ${MPI_LIBRARIES})
SET_TARGET_PROPERTIES(pvtkpython PROPERTIES LINK_FLAGS "${VTKPYTHON_LINK_FLAGS}")
@@ -230,6 +230,7 @@ ENDIF (VTK_USE_PARALLEL AND VTK_USE_MPI)
IF(NOT VTK_INSTALL_NO_RUNTIME AND NOT VTK_INSTALL_NO_VTKPYTHON)
INSTALL(TARGETS vtkpython ${PVTKPYTHON_EXECUTABLE}
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeExecutables # .exe, .dll
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development # .a, .lib
diff --git a/Wrapping/Tcl/CMakeLists.txt b/Wrapping/Tcl/CMakeLists.txt
index b35efe9..8ad8a53 100644
--- a/Wrapping/Tcl/CMakeLists.txt
+++ b/Wrapping/Tcl/CMakeLists.txt
@@ -51,7 +51,7 @@ IF (WIN32)
ENDIF (WIN32)
# Create the vtk Tcl wrapper executable.
-ADD_EXECUTABLE(vtk vtkTkAppInit.cxx ${VTK_EXE_RESOURCE_FILES})
+VTK_ADD_EXECUTABLE(vtk vtkTkAppInit.cxx ${VTK_EXE_RESOURCE_FILES})
TARGET_LINK_LIBRARIES (vtk
vtkCommonTCL
vtkFilteringTCL
@@ -110,6 +110,7 @@ SET(VTK_TCL_INSTALL_DIR_CM24 ${VTK_INSTALL_TCL_DIR_CM24}/tcl)
IF(NOT VTK_INSTALL_NO_RUNTIME)
INSTALL(TARGETS vtk
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeExecutables # .exe, .dll
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development # .a, .lib
@@ -127,7 +128,7 @@ IF (VTK_USE_PARALLEL)
SET(MPI_LIBRARIES ${MPI_LIBRARIES} "${MPI_EXTRA_LIBRARY}")
ENDIF (MPI_EXTRA_LIBRARY)
- ADD_EXECUTABLE(pvtk vtkParaTkAppInit.cxx ${VTK_EXE_RESOURCE_FILES})
+ VTK_ADD_EXECUTABLE(pvtk vtkParaTkAppInit.cxx ${VTK_EXE_RESOURCE_FILES})
IF(VTK_USE_CARBON)
FIND_PROGRAM(VTK_APPLE_RESOURCE Rez /Developer/Tools)
IF(VTK_APPLE_RESOURCE)
@@ -176,6 +177,7 @@ IF (VTK_USE_PARALLEL)
IF(NOT VTK_INSTALL_NO_RUNTIME)
INSTALL(TARGETS pvtk
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeExecutables # .exe, .dll
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development # .a, .lib
diff --git a/debian/changelog b/debian/changelog
index acd42fb..5b05aa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vtk (5.6.1-6+buildsys1) UNRELEASED; urgency=low
+
+ * Experimental build system fix to drop VTKLibraryDepends.cmake.
+
+ -- Michael Schutte <michi@debian.org> Mon, 08 Aug 2011 19:33:04 +0200
+
vtk (5.6.1-6) unstable; urgency=low
* VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx:
diff --git a/debian/libvtk-java.install b/debian/libvtk-java.install
index df2f75f..29d6dd7 100644
--- a/debian/libvtk-java.install
+++ b/debian/libvtk-java.install
@@ -1,5 +1,5 @@
usr/bin/vtkWrapJava usr/bin
usr/bin/vtkParseJava usr/bin
usr/include/vtk-5.6/vtkJavaUtil.h usr/include/vtk-5.6
-usr/lib/vtk-5.6/*Java.so* usr/lib/jni
+usr/lib/*Java.so* usr/lib/jni
usr/share/java/vtk.jar usr/share/java
diff --git a/debian/libvtk5-dev.install b/debian/libvtk5-dev.install
index 36fe093..ed92eff 100644
--- a/debian/libvtk5-dev.install
+++ b/debian/libvtk5-dev.install
@@ -1,34 +1,34 @@
../../Common/vtkTemplateAliasMacro.h usr/include/vtk-5.6
usr/bin/vtkEncodeString usr/lib/vtk-5.6
usr/include/vtk-5.6 usr/include
-usr/lib/vtk-5.6/*.cmake
-usr/lib/vtk-5.6/CMake
-usr/lib/vtk-5.6/hints
-usr/lib/vtk-5.6/libCosmo.so usr/lib
-usr/lib/vtk-5.6/libMapReduceMPI.so usr/lib
-usr/lib/vtk-5.6/libVPIC.so usr/lib
-usr/lib/vtk-5.6/libvtkalglib.so usr/lib
-usr/lib/vtk-5.6/libvtkCharts.so usr/lib
-usr/lib/vtk-5.6/libvtkCommon.so usr/lib
-usr/lib/vtk-5.6/libvtkDICOMParser.so usr/lib
-usr/lib/vtk-5.6/libvtkexoIIc.so usr/lib
-usr/lib/vtk-5.6/libvtkFiltering.so usr/lib
-usr/lib/vtk-5.6/libvtkftgl.so usr/lib
-usr/lib/vtk-5.6/libvtkGenericFiltering.so usr/lib
-usr/lib/vtk-5.6/libvtkGeovis.so usr/lib
-usr/lib/vtk-5.6/libvtkGraphics.so usr/lib
-usr/lib/vtk-5.6/libvtkHybrid.so usr/lib
-usr/lib/vtk-5.6/libvtkImaging.so usr/lib
-usr/lib/vtk-5.6/libvtkInfovis.so usr/lib
-usr/lib/vtk-5.6/libvtkIO.so usr/lib
-usr/lib/vtk-5.6/libvtkmetaio.so usr/lib
-usr/lib/vtk-5.6/libvtkParallel.so usr/lib
-usr/lib/vtk-5.6/libvtkproj4.so usr/lib
-usr/lib/vtk-5.6/libvtkRendering.so usr/lib
-usr/lib/vtk-5.6/libvtksqlite.so usr/lib
-usr/lib/vtk-5.6/libvtksys.so usr/lib
-usr/lib/vtk-5.6/libvtkverdict.so usr/lib
-usr/lib/vtk-5.6/libvtkViews.so usr/lib
-usr/lib/vtk-5.6/libvtkVolumeRendering.so usr/lib
-usr/lib/vtk-5.6/libvtkWidgets.so usr/lib
+usr/lib/*.cmake
+usr/lib/CMake
+usr/lib/hints
+usr/lib/libCosmo.so usr/lib
+usr/lib/libMapReduceMPI.so usr/lib
+usr/lib/libVPIC.so usr/lib
+usr/lib/libvtkalglib.so usr/lib
+usr/lib/libvtkCharts.so usr/lib
+usr/lib/libvtkCommon.so usr/lib
+usr/lib/libvtkDICOMParser.so usr/lib
+usr/lib/libvtkexoIIc.so usr/lib
+usr/lib/libvtkFiltering.so usr/lib
+usr/lib/libvtkftgl.so usr/lib
+usr/lib/libvtkGenericFiltering.so usr/lib
+usr/lib/libvtkGeovis.so usr/lib
+usr/lib/libvtkGraphics.so usr/lib
+usr/lib/libvtkHybrid.so usr/lib
+usr/lib/libvtkImaging.so usr/lib
+usr/lib/libvtkInfovis.so usr/lib
+usr/lib/libvtkIO.so usr/lib
+usr/lib/libvtkmetaio.so usr/lib
+usr/lib/libvtkParallel.so usr/lib
+usr/lib/libvtkproj4.so usr/lib
+usr/lib/libvtkRendering.so usr/lib
+usr/lib/libvtksqlite.so usr/lib
+usr/lib/libvtksys.so usr/lib
+usr/lib/libvtkverdict.so usr/lib
+usr/lib/libvtkViews.so usr/lib
+usr/lib/libvtkVolumeRendering.so usr/lib
+usr/lib/libvtkWidgets.so usr/lib
../../Utilities/DICOMParser/Copyright.txt usr/share/doc/libvtk5-dev/copyright.DICOMParser
diff --git a/debian/libvtk5-qt4-dev.install b/debian/libvtk5-qt4-dev.install
index 9eb8fff..d7d75f3 100644
--- a/debian/libvtk5-qt4-dev.install
+++ b/debian/libvtk5-qt4-dev.install
@@ -1,6 +1,6 @@
usr/include/vtk-5.6/QVTK* usr/include
usr/include/vtk-5.6/vtkQt* usr/include
-usr/lib/vtk-5.6/libQVTK.so usr/lib
-usr/lib/vtk-5.6/libvtkQtChart.so usr/lib
-usr/lib/vtk-5.6/VTKConfigQt.cmake usr/lib
+usr/lib/libQVTK.so usr/lib
+usr/lib/libvtkQtChart.so usr/lib
+usr/lib/VTKConfigQt.cmake usr/lib
usr/plugins/designer/* usr/lib/qt4/plugins/designer
diff --git a/debian/libvtk5.6-qt4.install b/debian/libvtk5.6-qt4.install
index 0692767..a137c8e 100644
--- a/debian/libvtk5.6-qt4.install
+++ b/debian/libvtk5.6-qt4.install
@@ -1,3 +1,3 @@
#qt4-support/usr/lib/vtk-5.6/lib*.so.* usr/lib
-usr/lib/vtk-5.6/libQVTK.so.* usr/lib
-usr/lib/vtk-5.6/libvtkQtChart.so.* usr/lib
+usr/lib/libQVTK.so.* usr/lib
+usr/lib/libvtkQtChart.so.* usr/lib
diff --git a/debian/libvtk5.6.install b/debian/libvtk5.6.install
index 058fc81..196cc90 100644
--- a/debian/libvtk5.6.install
+++ b/debian/libvtk5.6.install
@@ -1,27 +1,27 @@
-usr/lib/vtk-5.6/libCosmo.so.* usr/lib
-usr/lib/vtk-5.6/libMapReduceMPI.so.* usr/lib
-usr/lib/vtk-5.6/libVPIC.so.* usr/lib
-usr/lib/vtk-5.6/libvtkalglib.so.* usr/lib
-usr/lib/vtk-5.6/libvtkCharts.so.* usr/lib
-usr/lib/vtk-5.6/libvtkCommon.so.* usr/lib
-usr/lib/vtk-5.6/libvtkDICOMParser.so.* usr/lib
-usr/lib/vtk-5.6/libvtkexoIIc.so.* usr/lib
-usr/lib/vtk-5.6/libvtkFiltering.so.* usr/lib
-usr/lib/vtk-5.6/libvtkftgl.so.* usr/lib
-usr/lib/vtk-5.6/libvtkGenericFiltering.so.* usr/lib
-usr/lib/vtk-5.6/libvtkGeovis.so.* usr/lib
-usr/lib/vtk-5.6/libvtkGraphics.so.* usr/lib
-usr/lib/vtk-5.6/libvtkHybrid.so.* usr/lib
-usr/lib/vtk-5.6/libvtkImaging.so.* usr/lib
-usr/lib/vtk-5.6/libvtkInfovis.so.* usr/lib
-usr/lib/vtk-5.6/libvtkIO.so.* usr/lib
-usr/lib/vtk-5.6/libvtkmetaio.so.* usr/lib
-usr/lib/vtk-5.6/libvtkParallel.so.* usr/lib
-usr/lib/vtk-5.6/libvtkproj4.so.* usr/lib
-usr/lib/vtk-5.6/libvtkRendering.so.* usr/lib
-usr/lib/vtk-5.6/libvtksqlite.so.* usr/lib
-usr/lib/vtk-5.6/libvtksys.so.* usr/lib
-usr/lib/vtk-5.6/libvtkverdict.so.* usr/lib
-usr/lib/vtk-5.6/libvtkViews.so.* usr/lib
-usr/lib/vtk-5.6/libvtkVolumeRendering.so.* usr/lib
-usr/lib/vtk-5.6/libvtkWidgets.so.* usr/lib
+usr/lib/libCosmo.so.* usr/lib
+usr/lib/libMapReduceMPI.so.* usr/lib
+usr/lib/libVPIC.so.* usr/lib
+usr/lib/libvtkalglib.so.* usr/lib
+usr/lib/libvtkCharts.so.* usr/lib
+usr/lib/libvtkCommon.so.* usr/lib
+usr/lib/libvtkDICOMParser.so.* usr/lib
+usr/lib/libvtkexoIIc.so.* usr/lib
+usr/lib/libvtkFiltering.so.* usr/lib
+usr/lib/libvtkftgl.so.* usr/lib
+usr/lib/libvtkGenericFiltering.so.* usr/lib
+usr/lib/libvtkGeovis.so.* usr/lib
+usr/lib/libvtkGraphics.so.* usr/lib
+usr/lib/libvtkHybrid.so.* usr/lib
+usr/lib/libvtkImaging.so.* usr/lib
+usr/lib/libvtkInfovis.so.* usr/lib
+usr/lib/libvtkIO.so.* usr/lib
+usr/lib/libvtkmetaio.so.* usr/lib
+usr/lib/libvtkParallel.so.* usr/lib
+usr/lib/libvtkproj4.so.* usr/lib
+usr/lib/libvtkRendering.so.* usr/lib
+usr/lib/libvtksqlite.so.* usr/lib
+usr/lib/libvtksys.so.* usr/lib
+usr/lib/libvtkverdict.so.* usr/lib
+usr/lib/libvtkViews.so.* usr/lib
+usr/lib/libvtkVolumeRendering.so.* usr/lib
+usr/lib/libvtkWidgets.so.* usr/lib
diff --git a/debian/python-vtk.install b/debian/python-vtk.install
index 3eca9ec..42b0d8f 100644
--- a/debian/python-vtk.install
+++ b/debian/python-vtk.install
@@ -1,6 +1,6 @@
usr/bin/vtkWrapPython
usr/bin/vtkWrapPythonInit
usr/bin/vtkpython
-usr/lib/vtk-5.6/*Python*.so* usr/lib
+usr/lib/*Python*.so* usr/lib
usr/lib/vtk-5.6/testing/*py usr/lib/vtk-5.6/testing/
usr/lib/python2.*/*-packages/*
diff --git a/debian/rules b/debian/rules
index 8414100..d199a2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,7 @@ configure-stamp:
echo PYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) >> Build/CMakeCache.txt
echo PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so >> Build/CMakeCache.txt
echo CMAKE_INSTALL_PREFIX:PATH=$(CURDIR)/debian/tmp/usr >> Build/CMakeCache.txt
- echo VTK_INSTALL_LIB_DIR:PATH=/lib/vtk-$(MAJOR).$(MINOR) >> Build/CMakeCache.txt
+ echo VTK_INSTALL_LIB_DIR:PATH=/lib >> Build/CMakeCache.txt
echo VTK_INSTALL_PACKAGE_DIR:PATH=/lib/vtk-$(MAJOR).$(MINOR) >> Build/CMakeCache.txt
if [ "X$(DARTP)" = XUSE_DART ]; then echo DART_ROOT:PATH=/usr/share/Dart >> Build/CMakeCache.txt; fi
echo VTK_PYTHON_SETUP_ARGS:STRING=--install-layout=deb --root=$(CURDIR)/debian/tmp/ >> Build/CMakeCache.txt
diff --git a/debian/tcl-vtk.install b/debian/tcl-vtk.install
index 6a8977c..02b5544 100644
--- a/debian/tcl-vtk.install
+++ b/debian/tcl-vtk.install
@@ -1,4 +1,4 @@
-usr/lib/vtk-5.6/*TCL.so* usr/lib
+usr/lib/*TCL.so* usr/lib
usr/bin/vtk
usr/bin/vtkWrapTcl
usr/bin/vtkWrapTclInit
diff --git a/vtkGenerateVTKConfig.cmake b/vtkGenerateVTKConfig.cmake
index a8cc275..d30453d 100644
--- a/vtkGenerateVTKConfig.cmake
+++ b/vtkGenerateVTKConfig.cmake
@@ -144,8 +144,8 @@ SET(VTK_TCL_TK_MACROS_MODULE_CONFIG
"${VTK_CMAKE_DIR}/vtkTclTkMacros.cmake")
SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${VTK_BINARY_DIR}/CMake)
-# Library dependencies file.
-SET(VTK_LIBRARY_DEPENDS_FILE "${VTK_BINARY_DIR}/VTKLibraryDepends.cmake")
+# Export Targets file.
+SET(VTK_TARGETS_FILE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
# Build configuration information.
SET(VTK_CONFIGURATION_TYPES_CONFIG ${CMAKE_CONFIGURATION_TYPES})
@@ -293,7 +293,7 @@ IF(VTK_TCL_TK_COPY_SUPPORT_LIBRARY)
SET (TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
SET(VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG
${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_TCL_DIR}/tcl${TCL_TK_VERSION})
- SET(VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG
+ SET(VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG
${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_TCL_DIR}/tk${TCL_TK_VERSION})
ELSE(VTK_TCL_TK_COPY_SUPPORT_LIBRARY)
SET(VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG ${VTK_TCL_SUPPORT_LIBRARY_PATH})
@@ -307,8 +307,8 @@ SET(VTK_TCL_TK_MACROS_MODULE_CONFIG
"${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/CMake/vtkTclTkMacros.cmake")
SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/CMake)
-# Library dependencies file.
-SET(VTK_LIBRARY_DEPENDS_FILE "${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/VTKLibraryDepends.cmake")
+# Exported targets file.
+SET(VTK_TARGETS_FILE "${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
# No backward compatibility hack needed for installed path
SET(VTK_CONFIG_BACKWARD_COMPATIBILITY_HACK)
diff --git a/vtkMacros.cmake b/vtkMacros.cmake
index 86c1059..8f65515 100644
--- a/vtkMacros.cmake
+++ b/vtkMacros.cmake
@@ -18,7 +18,7 @@ MACRO(VTK_USE_INSTANTIATOR KIT CAPS_KIT)
EXPORT_MACRO VTK_${CAPS_KIT}_EXPORT
HEADER_LOCATION ${VTK_BINARY_DIR})
ENDIF (COMMAND VTK_MAKE_INSTANTIATOR2)
- ADD_LIBRARY(vtk${KIT}${VTK_VERSION} ${${KIT}_SRCS} ${Instantiator_SRCS})
+ VTK_ADD_LIBRARY(vtk${KIT}${VTK_VERSION} ${${KIT}_SRCS} ${Instantiator_SRCS})
ENDMACRO(VTK_USE_INSTANTIATOR KIT CAPS_KIT)
#
@@ -32,13 +32,14 @@ MACRO(VTK_USE_TCL KIT DEPEND)
IF (VTK_WRAP_TCL)
VTK_WRAP_TCL(vtk${KIT}TCL${VTK_VERSION} ${KIT}TCL_SRCS ${${KIT}_SRCS})
IF (APPLE)
- ADD_LIBRARY(vtk${KIT}TCL${VTK_VERSION} SHARED ${${KIT}TCL_SRCS})
+ VTK_ADD_LIBRARY(vtk${KIT}TCL${VTK_VERSION} SHARED ${${KIT}TCL_SRCS})
ELSE (APPLE)
- ADD_LIBRARY(vtk${KIT}TCL${VTK_VERSION} ${${KIT}TCL_SRCS})
+ VTK_ADD_LIBRARY(vtk${KIT}TCL${VTK_VERSION} ${${KIT}TCL_SRCS})
ENDIF (APPLE)
TARGET_LINK_LIBRARIES(vtk${KIT}TCL${VTK_VERSION}
${DEPEND} vtk${KIT}${VTK_VERSION} ${TCL_LIBRARY})
INSTALL(TARGETS vtk${KIT}TCL${VTK_VERSION}
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries # .exe, .dll
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development # .a, .lib
@@ -58,7 +59,7 @@ MACRO(VTK_USE_PYTHON KIT DEPEND)
IF (VTK_WRAP_PYTHON)
VTK_WRAP_PYTHON(vtk${KIT}Python${VTK_VERSION}
${KIT}Python_SRCS ${${KIT}_SRCS})
- ADD_LIBRARY(vtk${KIT}Python${VTK_VERSION} MODULE ${${KIT}Python_SRCS})
+ VTK_ADD_LIBRARY(vtk${KIT}Python${VTK_VERSION} MODULE ${${KIT}Python_SRCS})
IF (NOT APPLE)
TARGET_LINK_LIBRARIES (vtk${KIT}Python${VTK_VERSION} ${DEPEND})
ENDIF (NOT APPLE)
@@ -70,6 +71,7 @@ MACRO(VTK_USE_PYTHON KIT DEPEND)
TARGET_LINK_LIBRARIES(vtk${KIT}Python${VTK_VERSION}
vtk${KIT}${VTK_VERSION})
INSTALL(TARGETS vtk${KIT}Python${VTK_VERSION}
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries # .exe, .dll
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development # .a, .lib
@@ -87,10 +89,11 @@ ENDMACRO(VTK_USE_PYTHON)
MACRO(VTK_USE_JAVA KIT DEPEND)
IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA(vtk${KIT}Java${VTK_VERSION} ${KIT}Java_SRCS ${${KIT}_SRCS})
- ADD_LIBRARY(vtk${KIT}Java${VTK_VERSION} SHARED ${${KIT}Java_SRCS})
+ VTK_ADD_LIBRARY(vtk${KIT}Java${VTK_VERSION} SHARED ${${KIT}Java_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}Java${VTK_VERSION}
${DEPEND} vtk${KIT}${VTK_VERSION})
INSTALL(TARGETS vtk${KIT}Java${VTK_VERSION}
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries # .exe, .dll
LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development # .a, .lib
Attachment:
signature.asc
Description: Digital signature