Commit 0237f1dc authored by Brad King's avatar Brad King 💬
Browse files

ENH: Using variables VTK_INSTALL_BIN_DIR, VTK_INSTALL_LIB_DIR, and...

ENH: Using variables VTK_INSTALL_BIN_DIR, VTK_INSTALL_LIB_DIR, and VTK_INSTALL_INCLUDE_DIR for install locations.  They default to the old values (/bin, /lib/vtk, and /include/vtk) but can be changed by parent projects like ParaView to install inner VTK instances in a special location.
parent 2e38922f
......@@ -17,7 +17,7 @@ MACRO(VTK_EXPORT_KIT kit ukit sources)
ENDFOREACH(src)
SET(VTK_EXPORT_KIT ${kit})
SET(VTK_EXPORT_UKIT ${ukit})
SET(VTK_EXPORT_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include/vtk)
SET(VTK_EXPORT_HEADER_DIR ${CMAKE_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR})
CONFIGURE_FILE(${VTK_SOURCE_DIR}/CMake/vtkKit.cmake.in
${VTK_BINARY_DIR}/Utilities/InstallOnly/vtk${kit}Kit.cmake
@ONLY IMMEDIATE)
......@@ -25,7 +25,7 @@ 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(/lib/vtk FILES
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} FILES
${VTK_BINARY_DIR}/Utilities/InstallOnly/vtk${kit}Kit.cmake
)
ENDMACRO(VTK_EXPORT_KIT)
......@@ -28,6 +28,21 @@ SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
# Put "." in the rpath of all VTK shared libraries.
LINK_DIRECTORIES(.)
#-----------------------------------------------------------------------------
# Configure install locations. This allows parent projects to modify
# the install location. Optionally allow the project to specify a
# single VTK_INSTALL_ROOT which basically adds to its install prefix
# for VTK only.
IF(NOT VTK_INSTALL_BIN_DIR)
SET(VTK_INSTALL_BIN_DIR ${VTK_INSTALL_ROOT}/bin)
ENDIF(NOT VTK_INSTALL_BIN_DIR)
IF(NOT VTK_INSTALL_INCLUDE_DIR)
SET(VTK_INSTALL_INCLUDE_DIR ${VTK_INSTALL_ROOT}/include/vtk)
ENDIF(NOT VTK_INSTALL_INCLUDE_DIR)
IF(NOT VTK_INSTALL_LIB_DIR)
SET(VTK_INSTALL_LIB_DIR ${VTK_INSTALL_ROOT}/lib/vtk)
ENDIF(NOT VTK_INSTALL_LIB_DIR)
#-----------------------------------------------------------------------------
# Load some macros.
INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkDependentOption.cmake)
......@@ -39,7 +54,7 @@ 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(/lib/vtk .cmake VTKBuildSettings)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} .cmake VTKBuildSettings)
#-----------------------------------------------------------------------------
# Choose static or shared libraries.
......@@ -701,7 +716,8 @@ 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(/include/vtk/vtkstd FILES ${VTK_BINARY_DIR}/vtkstd/${header})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkstd
FILES ${VTK_BINARY_DIR}/vtkstd/${header})
ENDFOREACH(header)
#-----------------------------------------------------------------------------
......@@ -767,8 +783,8 @@ IF(VTK_WRAP_TCL)
ENDIF(VTK_WRAP_TCL)
INSTALL_FILES(/lib/vtk/CMake FILES
${VTK_SOURCE_DIR}/CMake/vtkTclTkMacros.cmake)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/CMake
FILES ${VTK_SOURCE_DIR}/CMake/vtkTclTkMacros.cmake)
#-----------------------------------------------------------------------------
# Configure Python wrapping support.
......@@ -973,23 +989,25 @@ INCLUDE_DIRECTORIES(
# Help other projects use VTK.
# Install the instantiator headers.
INSTALL_FILES(/include/vtk .h vtkCommonInstantiator vtkFilteringInstantiator
vtkIOInstantiator vtkImagingInstantiator vtkGraphicsInstantiator vtkGenericFilteringInstantiator)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkCommonInstantiator
vtkFilteringInstantiator vtkIOInstantiator
vtkImagingInstantiator vtkGraphicsInstantiator
vtkGenericFilteringInstantiator)
IF(VTK_USE_RENDERING)
INSTALL_FILES(/include/vtk .h vtkRenderingInstantiator)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkRenderingInstantiator)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_HYBRID)
INSTALL_FILES(/include/vtk .h vtkHybridInstantiator)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkHybridInstantiator)
ENDIF(VTK_USE_HYBRID)
IF(VTK_USE_PATENTED)
INSTALL_FILES(/include/vtk .h vtkPatentedInstantiator)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkPatentedInstantiator)
ENDIF(VTK_USE_PATENTED)
IF(VTK_USE_PARALLEL)
INSTALL_FILES(/include/vtk .h vtkParallelInstantiator)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkParallelInstantiator)
ENDIF(VTK_USE_PARALLEL)
# Install cmake extensions so user projects can load them.
INSTALL_FILES(/lib/vtk/CMake FILES
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
......@@ -998,10 +1016,10 @@ 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(/lib/vtk/CMake FILES ${CMAKE_LOADED_COMMAND_${cmd}})
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(/lib/vtk/CMake FILES
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)
......@@ -1012,10 +1030,10 @@ ENDIF (VTK_NEED_LOADED_COMMANDS)
EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake)
# Install some files.
INSTALL_FILES(/include/vtk .h vtkConfigure vtkToolkits)
INSTALL_FILES(/lib/vtk .cmake UseVTK VTKLibraryDepends)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkConfigure vtkToolkits)
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} .cmake UseVTK VTKLibraryDepends)
IF(VTK_WRAP_HINTS)
INSTALL_FILES(/lib/vtk FILES ${VTK_WRAP_HINTS})
INSTALL_FILES(${VTK_INSTALL_LIB_DIR} FILES ${VTK_WRAP_HINTS})
ENDIF(VTK_WRAP_HINTS)
#-----------------------------------------------------------------------------
......
......@@ -235,7 +235,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -249,7 +249,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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 +257,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -267,13 +267,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(/lib/vtk vtk${KIT})
INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......@@ -289,7 +289,7 @@ ENDIF(LOCALUSERMACRODEFINED)
# End of common section
# -----------------------------------------------------------------
INSTALL_FILES(/include/vtk .h
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkDataArrayTemplate
vtkIOStream
vtkIOStreamFwd
......@@ -301,22 +301,22 @@ INSTALL_FILES(/include/vtk .h
)
IF(VTK_WRAP_TCL)
INSTALL_FILES(/include/vtk .h
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkTcl
vtkTclUtil
vtkTk
)
ENDIF(VTK_WRAP_TCL)
IF(VTK_WRAP_PYTHON)
INSTALL_FILES(/include/vtk .h
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkPythonUtil
)
INSTALL_FILES(/include/vtk FILES
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} FILES
vtkPython.h
)
IF (TK_LIBRARY)
IF(NOT VTK_USE_COCOA)
INSTALL_FILES(/include/vtk .h
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkTcl
vtkTk
)
......@@ -324,26 +324,26 @@ IF(VTK_WRAP_PYTHON)
ENDIF (TK_LIBRARY)
ENDIF(VTK_WRAP_PYTHON)
IF(VTK_WRAP_JAVA)
INSTALL_FILES(/include/vtk .h
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkJavaUtil
)
ENDIF(VTK_WRAP_JAVA)
INSTALL_FILES(/include/vtk .txx
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .txx
vtkDataArrayTemplate
vtkDataArrayTemplateImplicit
)
INSTALL_FILES(/lib/vtk/testing FILES
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(/include/vtk FILES
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} FILES
${VTK_SOURCE_DIR}/${KIT}/Testing/Cxx/vtkTestUtilities.h)
IF(VTK_USE_PARALLEL)
INSTALL_FILES(/lib/vtk/testing FILES
INSTALL_FILES(${VTK_INSTALL_LIB_DIR}/testing FILES
${VTK_SOURCE_DIR}/${KIT}/Testing/Tcl/prtImageTest.tcl)
ENDIF(VTK_USE_PARALLEL)
......@@ -5,6 +5,7 @@ VTK_SOURCE_DIR="@VTK_SOURCE_DIR@"
VTK_BINARY_DIR="@VTK_BINARY_DIR@"
CMAKE_INSTALL_PREFIX="@CMAKE_INSTALL_PREFIX@"
CMAKE_MAKE_PROGRAM="@CMAKE_MAKE_PROGRAM@"
VTK_INSTALL_LIB_DIR="@VTK_INSTALL_LIB_DIR@"
SOURCE_DIR="${VTK_SOURCE_DIR}/Common/Testing/Install"
BINARY_DIR="${VTK_BINARY_DIR}/Common/Testing/Install"
......@@ -47,7 +48,7 @@ write_cache()
echo "Writing CMakeCache.txt"
(
cat > CMakeCache.txt <<EOF
VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}/lib/vtk
VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}${VTK_INSTALL_LIB_DIR}
EOF
)
}
......
......@@ -30,7 +30,7 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
ADD_LIBRARY (vtkmyCommonPython MODULE vtkmyCommonPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyCommonPythonD vtkmyCommon vtkCommon vtkCommonPythonD)
TARGET_LINK_LIBRARIES(vtkmyCommonPython vtkmyCommonPythonD)
INSTALL_TARGETS(/lib/vtk vtkmyCommonPythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtkmyCommonPythonD)
ELSE(APPLE)
ADD_LIBRARY (vtkmyCommonPython MODULE ${CommonPython_SRCS})
TARGET_LINK_LIBRARIES (vtkmyCommonPython vtkmyCommon vtkCommonPython)
......
......@@ -30,7 +30,7 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
ADD_LIBRARY (vtkmyImagingPython MODULE vtkmyImagingPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyImagingPythonD vtkmyImaging vtkmyCommonPythonD vtkImaging vtkImagingPythonD)
TARGET_LINK_LIBRARIES(vtkmyImagingPython vtkmyImagingPythonD)
INSTALL_TARGETS(/lib/vtk vtkmyImagingPythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtkmyImagingPythonD)
ELSE(APPLE)
ADD_LIBRARY (vtkmyImagingPython MODULE ${ImagingPython_SRCS})
TARGET_LINK_LIBRARIES (vtkmyImagingPython vtkmyCommonPython vtkmyImaging)
......
......@@ -46,7 +46,7 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
ADD_LIBRARY (vtkmyUnsortedPython MODULE vtkmyUnsortedPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyUnsortedPythonD vtkmyUnsorted vtkmyCommonPythonD)
TARGET_LINK_LIBRARIES(vtkmyUnsortedPython vtkmyUnsortedPythonD)
INSTALL_TARGETS(/lib/vtk vtkmyUnsortedPythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtkmyUnsortedPythonD)
ELSE(APPLE)
ADD_LIBRARY (vtkmyUnsortedPython MODULE ${UnsortedPython_SRCS})
TARGET_LINK_LIBRARIES (vtkmyUnsortedPython vtkmyCommonPython vtkmyUnsorted)
......
......@@ -313,7 +313,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -327,7 +327,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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 +335,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -345,13 +345,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(/lib/vtk vtk${KIT})
INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......@@ -367,12 +367,12 @@ ENDIF(LOCALUSERMACRODEFINED)
# End of common section
# -----------------------------------------------------------------
INSTALL_FILES(/include/vtk .h
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h
vtkAMRBox
vtkCellType
)
INSTALL_FILES(/include/vtk .txx
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .txx
vtkImageIterator
vtkImageProgressIterator
)
......@@ -66,6 +66,6 @@ ENDIF ( UNIX )
INSTALL_FILES(/include/vtk QVTKWidget.h)
INSTALL_TARGETS( /lib/vtk QVTK )
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} QVTKWidget.h)
INSTALL_TARGETS( ${VTK_INSTALL_LIB_DIR} QVTK )
......@@ -53,7 +53,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -67,7 +67,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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 +75,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -85,13 +85,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(/lib/vtk vtk${KIT})
INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......
......@@ -224,7 +224,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -238,7 +238,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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})
......@@ -246,7 +246,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -256,13 +256,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(/lib/vtk vtk${KIT})
INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......
......@@ -130,7 +130,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -144,7 +144,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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 +152,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -162,13 +162,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(/lib/vtk vtk${KIT})
INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......@@ -183,4 +183,4 @@ ENDIF(LOCALUSERMACRODEFINED)
# End of common section
# -----------------------------------------------------------------
INSTALL_FILES(/include/vtk .h vtk3DS)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtk3DS)
......@@ -191,7 +191,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -205,7 +205,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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})
......@@ -213,7 +213,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -223,13 +223,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(/lib/vtk vtk${KIT})
INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......
......@@ -163,7 +163,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -177,7 +177,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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})
......@@ -185,7 +185,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -195,13 +195,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
INSTALL_TARGETS(/lib/vtk vtk${KIT})
INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
......
......@@ -173,7 +173,7 @@ 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(/lib/vtk vtk${KIT}TCL)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -187,7 +187,7 @@ 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(/lib/vtk vtk${KIT}PythonD)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
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})
......@@ -195,7 +195,7 @@ IF (VTK_WRAP_PYTHON)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -205,13 +205,13 @@ 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(/lib/vtk vtk${KIT}Java)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})