Commit b6c99d54 authored by Amy Squillacote's avatar Amy Squillacote
Browse files

ENH: copying Brad's installation changes from the main tree to the ParaView 2.0 branch

parent cab4a863
......@@ -25,7 +25,9 @@ MACRO(VTK_EXPORT_KIT kit ukit sources)
CONFIGURE_FILE(${VTK_SOURCE_DIR}/CMake/vtkKit.cmake.in
${VTK_BINARY_DIR}/Utilities/vtk${kit}Kit.cmake
@ONLY IMMEDIATE)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} FILES
${VTK_BINARY_DIR}/Utilities/InstallOnly/vtk${kit}Kit.cmake
)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} FILES
${VTK_BINARY_DIR}/Utilities/InstallOnly/vtk${kit}Kit.cmake
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDMACRO(VTK_EXPORT_KIT)
......@@ -43,6 +43,28 @@ IF(NOT VTK_INSTALL_LIB_DIR)
SET(VTK_INSTALL_LIB_DIR ${VTK_INSTALL_ROOT}/lib/vtk)
ENDIF(NOT VTK_INSTALL_LIB_DIR)
# There are three basic components to the VTK installation: runtime,
# development, and documentation. Install rules for each component
# are surrounded by blockers. Parent projects or users can specify
# VTK_INSTALL_NO_RUNTIME, VTK_INSTALL_NO_DEVELOPMENT, or
# VTK_INSTALL_NO_DOCUMENTATION to avoid installation of the
# corresponding component.
# Shared libraries are considered both runtime and development and
# static libraries are considered development only. In order to
# switch library installation on and off correctly we make the
# decision here.
SET(VTK_INSTALL_NO_LIBRARIES)
IF(BUILD_SHARED_LIBS)
IF(VTK_INSTALL_NO_RUNTIME AND VTK_INSTALL_NO_DEVELOPMENT)
SET(VTK_INSTALL_NO_LIBRARIES 1)
ENDIF(VTK_INSTALL_NO_RUNTIME AND VTK_INSTALL_NO_DEVELOPMENT)
ELSE(BUILD_SHARED_LIBS)
IF(VTK_INSTALL_NO_DEVELOPMENT)
SET(VTK_INSTALL_NO_LIBRARIES 1)
ENDIF(VTK_INSTALL_NO_DEVELOPMENT)
ENDIF(BUILD_SHARED_LIBS)
#-----------------------------------------------------------------------------
# Load some macros.
INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkDependentOption.cmake)
......@@ -54,7 +76,9 @@ INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
#-----------------------------------------------------------------------------
# Save the compiler settings so another project can import them.
CMAKE_EXPORT_BUILD_SETTINGS(${VTK_BINARY_DIR}/VTKBuildSettings.cmake)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} .cmake VTKBuildSettings)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} .cmake VTKBuildSettings)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
#-----------------------------------------------------------------------------
# Choose static or shared libraries.
......@@ -716,8 +740,10 @@ FOREACH(header algorithm deque iterator list map numeric queue set stack string
SET(VTK_STL_HEADER "${header}")
CONFIGURE_FILE(${VTK_SOURCE_DIR}/Utilities/vtkstd.h.in
${VTK_BINARY_DIR}/vtkstd/${header} @ONLY IMMEDIATE)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkstd
FILES ${VTK_BINARY_DIR}/vtkstd/${header})
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkstd
FILES ${VTK_BINARY_DIR}/vtkstd/${header})
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
ENDFOREACH(header)
#-----------------------------------------------------------------------------
......@@ -783,8 +809,10 @@ IF(VTK_WRAP_TCL)
ENDIF(VTK_WRAP_TCL)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake
FILES ${VTK_SOURCE_DIR}/CMake/vtkTclTkMacros.cmake)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake
FILES ${VTK_SOURCE_DIR}/CMake/vtkTclTkMacros.cmake)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
#-----------------------------------------------------------------------------
# Configure Python wrapping support.
......@@ -988,53 +1016,57 @@ INCLUDE_DIRECTORIES(
#-----------------------------------------------------------------------------
# Help other projects use VTK.
# Install the instantiator headers.
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkCommonInstantiator
vtkFilteringInstantiator vtkIOInstantiator
vtkImagingInstantiator vtkGraphicsInstantiator
vtkGenericFilteringInstantiator)
IF(VTK_USE_RENDERING)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkRenderingInstantiator)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_HYBRID)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkHybridInstantiator)
ENDIF(VTK_USE_HYBRID)
IF(VTK_USE_PATENTED)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkPatentedInstantiator)
ENDIF(VTK_USE_PATENTED)
IF(VTK_USE_PARALLEL)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkParallelInstantiator)
ENDIF(VTK_USE_PARALLEL)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
# Install the instantiator headers.
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkCommonInstantiator
vtkFilteringInstantiator vtkIOInstantiator
vtkImagingInstantiator vtkGraphicsInstantiator
vtkGenericFilteringInstantiator)
IF(VTK_USE_RENDERING)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkRenderingInstantiator)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_HYBRID)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkHybridInstantiator)
ENDIF(VTK_USE_HYBRID)
IF(VTK_USE_PATENTED)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkPatentedInstantiator)
ENDIF(VTK_USE_PATENTED)
IF(VTK_USE_PARALLEL)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkParallelInstantiator)
ENDIF(VTK_USE_PARALLEL)
# Install cmake extensions so user projects can load them.
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake FILES
${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake
${VTK_SOURCE_DIR}/CMake/vtkMakeInstantiator.cmake
${VTK_SOURCE_DIR}/CMake/vtkMakeInstantiator.h.in
${VTK_SOURCE_DIR}/CMake/vtkMakeInstantiator.cxx.in)
IF (VTK_NEED_LOADED_COMMANDS)
FOREACH(cmd VTK_WRAP_TCL2 VTK_WRAP_PYTHON2 VTK_WRAP_JAVA2
VTK_GENERATE_JAVA_DEPENDENCIES)
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.0)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake FILES ${CMAKE_LOADED_COMMAND_${cmd}})
ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.0)
IF(UNIX)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake FILES
"${VTK_BINARY_DIR}/CMake/${CMAKE_SHARED_MODULE_PREFIX}cm${cmd}${CMAKE_SHARED_MODULE_SUFFIX}")
ENDIF(UNIX)
ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.0)
ENDFOREACH(cmd)
ENDIF (VTK_NEED_LOADED_COMMANDS)
# Install cmake extensions so user projects can load them.
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake FILES
${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake
${VTK_SOURCE_DIR}/CMake/vtkMakeInstantiator.cmake
${VTK_SOURCE_DIR}/CMake/vtkMakeInstantiator.h.in
${VTK_SOURCE_DIR}/CMake/vtkMakeInstantiator.cxx.in)
IF (VTK_NEED_LOADED_COMMANDS)
FOREACH(cmd VTK_WRAP_TCL2 VTK_WRAP_PYTHON2 VTK_WRAP_JAVA2
VTK_GENERATE_JAVA_DEPENDENCIES)
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.0)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake FILES ${CMAKE_LOADED_COMMAND_${cmd}})
ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.0)
IF(UNIX)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake FILES
"${VTK_BINARY_DIR}/CMake/${CMAKE_SHARED_MODULE_PREFIX}cm${cmd}${CMAKE_SHARED_MODULE_SUFFIX}")
ENDIF(UNIX)
ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.0)
ENDFOREACH(cmd)
ENDIF (VTK_NEED_LOADED_COMMANDS)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
# Save library dependencies.
EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake)
# Install some files.
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkConfigure vtkToolkits)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} .cmake UseVTK VTKLibraryDepends)
IF(VTK_WRAP_HINTS)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} FILES ${VTK_WRAP_HINTS})
ENDIF(VTK_WRAP_HINTS)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkConfigure vtkToolkits)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} .cmake UseVTK VTKLibraryDepends)
IF(VTK_WRAP_HINTS)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} FILES ${VTK_WRAP_HINTS})
ENDIF(VTK_WRAP_HINTS)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
#-----------------------------------------------------------------------------
# Allow local additions to this file without CVS conflicts.
......
......@@ -235,7 +235,9 @@ IF (VTK_WRAP_TCL)
"${Kit_TCL_EXTRA_CMDS}")
ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -249,7 +251,9 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS}
${VTK_PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ELSE (APPLE)
ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
......@@ -257,7 +261,9 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -267,13 +273,19 @@ IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS}")
ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......@@ -289,61 +301,63 @@ ENDIF(LOCALUSERMACRODEFINED)
# End of common section
# -----------------------------------------------------------------
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkDataArrayTemplate
vtkIOStream
vtkIOStreamFwd
vtkSetGet
vtkSmartPointer
vtkSystemIncludes
vtkWin32Header
vtkWindows
)
IF(VTK_WRAP_TCL)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkTcl
vtkTclUtil
vtkTk
)
ENDIF(VTK_WRAP_TCL)
IF(VTK_WRAP_PYTHON)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkPythonUtil
)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} FILES
vtkPython.h
)
IF (TK_LIBRARY)
IF(NOT VTK_USE_COCOA)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkTcl
vtkTk
)
ENDIF(NOT VTK_USE_COCOA)
ENDIF (TK_LIBRARY)
ENDIF(VTK_WRAP_PYTHON)
IF(VTK_WRAP_JAVA)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkJavaUtil
)
ENDIF(VTK_WRAP_JAVA)
vtkDataArrayTemplate
vtkIOStream
vtkIOStreamFwd
vtkSetGet
vtkSmartPointer
vtkSystemIncludes
vtkWin32Header
vtkWindows
)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .txx
vtkDataArrayTemplate
vtkDataArrayTemplateImplicit
)
IF(VTK_WRAP_TCL)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkTcl
vtkTclUtil
vtkTk
)
ENDIF(VTK_WRAP_TCL)
IF(VTK_WRAP_PYTHON)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkPythonUtil
)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} FILES
vtkPython.h
)
IF (TK_LIBRARY)
IF(NOT VTK_USE_COCOA)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkTcl
vtkTk
)
ENDIF(NOT VTK_USE_COCOA)
ENDIF (TK_LIBRARY)
ENDIF(VTK_WRAP_PYTHON)
IF(VTK_WRAP_JAVA)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkJavaUtil
)
ENDIF(VTK_WRAP_JAVA)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .txx
vtkDataArrayTemplate
vtkDataArrayTemplateImplicit
)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/testing FILES
${VTK_SOURCE_DIR}/${KIT}/Testing/HeaderTesting.py
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/FindString.tcl
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/PrintSelfCheck.tcl
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/rtImageTest.tcl
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/TestSetGet.tcl
)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} FILES
${VTK_SOURCE_DIR}/${KIT}/Testing/Cxx/vtkTestUtilities.h)
IF(VTK_USE_PARALLEL)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/testing FILES
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/prtImageTest.tcl)
ENDIF(VTK_USE_PARALLEL)
${VTK_SOURCE_DIR}/${KIT}/Testing/HeaderTesting.py
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/FindString.tcl
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/PrintSelfCheck.tcl
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/rtImageTest.tcl
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/TestSetGet.tcl
)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} FILES
${VTK_SOURCE_DIR}/${KIT}/Testing/Cxx/vtkTestUtilities.h)
IF(VTK_USE_PARALLEL)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/testing FILES
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/prtImageTest.tcl)
ENDIF(VTK_USE_PARALLEL)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -313,7 +313,9 @@ IF (VTK_WRAP_TCL)
COMMANDS ${Kit_TCL_EXTRA_CMDS})
ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -327,7 +329,9 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS}
${VTK_PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ELSE (APPLE)
ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
......@@ -335,7 +339,9 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -345,13 +351,19 @@ IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS}")
ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......@@ -367,12 +379,14 @@ ENDIF(LOCALUSERMACRODEFINED)
# End of common section
# -----------------------------------------------------------------
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkAMRBox
vtkCellType
)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkAMRBox
vtkCellType
)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .txx
vtkImageIterator
vtkImageProgressIterator
)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .txx
vtkImageIterator
vtkImageProgressIterator
)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......@@ -18,3 +18,11 @@ TARGET_LINK_LIBRARIES( vtkMFC
vtkCommon
)
IF ( WIN32 )
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES( ${VTK_INSTALL_INCLUDE_DIR} .h )
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS( ${VTK_INSTALL_LIB_DIR} RUNTIME_DIRECTORY ${VTK_INSTALL_BIN_DIR} vtkMFC )
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF ( WIN32 )
......@@ -56,16 +56,24 @@ TARGET_LINK_LIBRARIES( QVTKWidgetPlugin
)
# install rules
INSTALL_TARGETS( /plugins/designer QVTKWidgetPlugin )
# install at /plugins/designer allows one to set their designer plugin path
# in the designer preferences to the vtk-install/plugins directory.
IF(NOT VTK_INSTALL_QT_DIR)
SET(VTK_INSTALL_QT_DIR /plugins/designer)
ENDIF(NOT VTK_INSTALL_QT_DIR)
IF(NOT VTK_INSTALL_NO_RUNTIME)
INSTALL_TARGETS( ${VTK_INSTALL_QT_DIR} QVTKWidgetPlugin )
ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
IF ( UNIX )
ADD_CUSTOM_TARGET( install-qtplugin
install -m 777 -o root ${VTK_BINARY_DIR}/bin/libQVTKWidgetPlugin.so ${QTDIR}/plugins/designer
install -m 777 -o root ${VTK_BINARY_DIR}/bin/libQVTKWidgetPlugin.so ${QTDIR}/${VTK_INSTALL_QT_DIR}
DEPENDS ${VTK_BINARY_DIR}/bin/libQVTKWidgetPlugin.so )
ENDIF ( UNIX )
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} QVTKWidget.h)
INSTALL_TARGETS( ${VTK_INSTALL_LIB_DIR} QVTK )
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES( ${VTK_INSTALL_INCLUDE_DIR} .h QVTKWidget)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS( ${VTK_INSTALL_LIB_DIR} QVTK )
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
......@@ -53,7 +53,9 @@ IF (VTK_WRAP_TCL)
"${Kit_TCL_EXTRA_CMDS}")
ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -67,7 +69,9 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS}
${VTK_PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ELSE (APPLE)
ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
......@@ -75,7 +79,9 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -85,13 +91,19 @@ IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS}")
ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......
......@@ -225,7 +225,9 @@ IF (VTK_WRAP_TCL)
"${Kit_TCL_EXTRA_CMDS}")
ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -239,7 +241,9 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS}
${VTK_PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ELSE (APPLE)
ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
......@@ -247,7 +251,9 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -257,13 +263,19 @@ IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS}")
ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......
......@@ -130,7 +130,9 @@ IF (VTK_WRAP_TCL)
"${Kit_TCL_EXTRA_CMDS}")
ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -144,7 +146,9 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS}
${VTK_PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ELSE (APPLE)
ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
......@@ -152,7 +156,9 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -162,13 +168,19 @@ IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS}")
ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})