Commit d1cf02d6 authored by Ken Martin's avatar Ken Martin

better install targets

parent 4abc63b4
......@@ -239,6 +239,8 @@ ENDIF (BUILD_EXAMPLES)
#
INSTALL_FILES(/include/vtk .h vtkConfigure vtkToolkits)
INSTALL_FILES(/include/vtk .cmake UseVTK)
INSTALL_FILES(/include/vtk .txt CMakeCache)
INCLUDE (${VTK_BINARY_DIR}/LocalUserOptions.cmake OPTIONAL)
INCLUDE (${VTK_SOURCE_DIR}/LocalUserOptions.cmake OPTIONAL)
......
......@@ -183,7 +183,7 @@ IF (VTK_WRAP_TCL)
VTK_WRAP_TCL(vtkCommonTCL CommonTCL_SRCS Common_SRCS)
ADD_LIBRARY(vtkCommonTCL CommonTCL_SRCS vtkTclUtil)
TARGET_LINK_LIBRARIES (vtkCommonTCL ${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkCommonTCL)
INSTALL_TARGETS(/lib/vtk vtkCommonTCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -199,7 +199,7 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkCommonPython
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkCommonPython)
INSTALL_TARGETS(/lib/vtk vtkCommonPython)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -208,11 +208,16 @@ ENDIF (VTK_WRAP_PYTHON)
IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA(vtkCommonJava CommonJava_SRCS Common_SRCS)
ADD_LIBRARY(vtkCommonJava CommonJava_SRCS vtkJavaUtil)
INSTALL_TARGETS(/lib vtkCommonJava)
INSTALL_TARGETS(/lib/vtk vtkCommonJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (vtkCommon )
INSTALL_TARGETS(/lib vtkCommon)
INSTALL_FILES(/include/vtk .h Common_SRCS)
INSTALL_TARGETS(/lib/vtk vtkCommon)
INSTALL_FILES(/include/vtk .h Common_SRCS
vtkCellType
vtkSetGet
vtkSystemIncludes
vtkWin32Header
)
PROJECT (Step1)
INCLUDE (${CMAKE_ROOT}/Modules/FindVTK.cmake)
IF (USE_INSTALLED_VTK)
INCLUDE (${VTK_INSTALL_DIR}/UseVTK.cmake)
ELSE (USE_INSTALLED_VTK)
INCLUDE (${VTK_SOURCE_DIR}/UseVTK.cmake)
ENDIF (USE_INSTALLED_VTK)
IF (USE_VTK_FILE)
INCLUDE(${USE_VTK_FILE})
ENDIF (USE_VTK_FILE)
LINK_LIBRARIES(
vtkRendering
......
......@@ -88,7 +88,7 @@ IF (VTK_WRAP_TCL)
VTK_WRAP_TCL(vtkFilteringTCL FilteringTCL_SRCS Filtering_SRCS)
ADD_LIBRARY(vtkFilteringTCL FilteringTCL_SRCS)
TARGET_LINK_LIBRARIES (vtkFilteringTCL vtkCommonTCL ${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkFilteringTCL)
INSTALL_TARGETS(/lib/vtk vtkFilteringTCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -105,7 +105,7 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkFilteringPython
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkFilteringPython)
INSTALL_TARGETS(/lib/vtk vtkFilteringPython)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -115,7 +115,7 @@ IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA(vtkFilteringJava FilteringJava_SRCS Filtering_SRCS)
ADD_LIBRARY(vtkFilteringJava FilteringJava_SRCS)
TARGET_LINK_LIBRARIES (vtkFilteringJava vtkCommonJava )
INSTALL_TARGETS(/lib vtkFilteringJava)
INSTALL_TARGETS(/lib/vtk vtkFilteringJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -123,5 +123,5 @@ vtkCommon
vtkFiltering
)
INSTALL_TARGETS(/lib vtkFiltering)
INSTALL_TARGETS(/lib/vtk vtkFiltering)
INSTALL_FILES(/include/vtk .h Filtering_SRCS)
......@@ -159,7 +159,7 @@ IF (VTK_WRAP_TCL)
ADD_LIBRARY(vtkGraphicsTCL GraphicsTCL_SRCS)
TARGET_LINK_LIBRARIES (vtkGraphicsTCL vtkFilteringTCL vtkCommonTCL
${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkGraphicsTCL)
INSTALL_TARGETS(/lib/vtk vtkGraphicsTCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -176,7 +176,7 @@ IF (VTK_WRAP_PYTHON)
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
ENDIF (APPLE)
INSTALL_TARGETS(/lib vtkGraphicsPython)
INSTALL_TARGETS(/lib/vtk vtkGraphicsPython)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -186,7 +186,7 @@ IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA(vtkGraphicsJava GraphicsJava_SRCS Graphics_SRCS)
ADD_LIBRARY(vtkGraphicsJava GraphicsJava_SRCS)
TARGET_LINK_LIBRARIES (vtkGraphicsJava vtkCommonJava vtkFilteringJava)
INSTALL_TARGETS(/lib vtkGraphicsJava)
INSTALL_TARGETS(/lib/vtk vtkGraphicsJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -196,6 +196,6 @@ vtkGraphics
)
INSTALL_TARGETS(/lib vtkGraphics)
INSTALL_TARGETS(/lib/vtk vtkGraphics)
INSTALL_FILES(/include/vtk .h Graphics_SRCS)
......@@ -47,7 +47,7 @@ IF (VTK_WRAP_TCL)
vtkFilteringTCL
vtkCommonTCL
${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkHybridTCL)
INSTALL_TARGETS(/lib/vtk vtkHybridTCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -72,7 +72,7 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkHybridPython
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkHybridPython)
INSTALL_TARGETS(/lib/vtk vtkHybridPython)
ENDIF (VTK_WRAP_PYTHON)
IF (VTK_WRAP_JAVA)
......@@ -85,7 +85,7 @@ IF (VTK_WRAP_JAVA)
vtkGraphicsJava
vtkRenderingJava
vtkIOJava)
INSTALL_TARGETS(/lib vtkHybridJava)
INSTALL_TARGETS(/lib/vtk vtkHybridJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -99,5 +99,5 @@ vtkHybrid
)
INSTALL_TARGETS(/lib vtkHybrid)
INSTALL_TARGETS(/lib/vtk vtkHybrid)
INSTALL_FILES(/include/vtk .h Hybrid_SRCS)
......@@ -81,7 +81,7 @@ IF (VTK_WRAP_TCL)
vtkFilteringTCL
vtkCommonTCL
${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkIOTCL)
INSTALL_TARGETS(/lib/vtk vtkIOTCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -100,7 +100,7 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkIOPython
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkIOPython)
INSTALL_TARGETS(/lib/vtk vtkIOPython)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -112,7 +112,7 @@ IF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES (vtkIOJava
vtkCommonJava
vtkFilteringJava)
INSTALL_TARGETS(/lib vtkIOJava)
INSTALL_TARGETS(/lib/vtk vtkIOJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -136,5 +136,5 @@ IF(WIN32)
ENDIF(NOT BUILD_SHARED_LIBS)
ENDIF(WIN32)
INSTALL_TARGETS(/lib vtkIO)
INSTALL_TARGETS(/lib/vtk vtkIO)
INSTALL_FILES(/include/vtk .h IO_SRCS)
......@@ -135,7 +135,7 @@ IF (VTK_WRAP_TCL)
vtkFilteringTCL
vtkCommonTCL
${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkImagingTCL)
INSTALL_TARGETS(/lib/vtk vtkImagingTCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -156,7 +156,7 @@ IF (VTK_WRAP_PYTHON)
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkImagingPython)
INSTALL_TARGETS(/lib/vtk vtkImagingPython)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -168,7 +168,7 @@ IF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES (vtkImagingJava
vtkCommonJava
vtkFilteringJava)
INSTALL_TARGETS(/lib vtkImagingJava)
INSTALL_TARGETS(/lib/vtk vtkImagingJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -177,5 +177,5 @@ vtkFiltering
vtkImaging
)
INSTALL_TARGETS(/lib vtkImaging)
INSTALL_TARGETS(/lib/vtk vtkImaging)
INSTALL_FILES(/include/vtk .h Imaging_SRCS)
......@@ -59,7 +59,7 @@ IF (VTK_WRAP_TCL)
vtkFilteringTCL
vtkCommonTCL
${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkParallelTCL)
INSTALL_TARGETS(/lib/vtk vtkParallelTCL)
IF (VTK_USE_MPI)
......@@ -136,7 +136,7 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkParallelPython
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkParallelPython)
INSTALL_TARGETS(/lib/vtk vtkParallelPython)
ENDIF (VTK_WRAP_PYTHON)
IF (VTK_WRAP_JAVA)
......@@ -149,7 +149,7 @@ IF (VTK_WRAP_JAVA)
vtkGraphicsJava
vtkRenderingJava
vtkIOJava)
INSTALL_TARGETS(/lib vtkParallelJava)
INSTALL_TARGETS(/lib/vtk vtkParallelJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -162,5 +162,5 @@ vtkFiltering
vtkCommon
)
INSTALL_TARGETS(/lib vtkParallel)
INSTALL_TARGETS(/lib/vtk vtkParallel)
INSTALL_FILES(/include/vtk .h Parallel_SRCS)
......@@ -27,7 +27,7 @@ IF (VTK_WRAP_TCL)
vtkGraphicsTCL vtkImagingTCL vtkFilteringTCL
vtkCommonTCL
${TCL_LIBRARY})
INSTALL_TARGETS(/lib vtkPatentedTCL)
INSTALL_TARGETS(/lib/vtk vtkPatentedTCL)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
......@@ -48,7 +48,7 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkPatentedPython
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkPatentedPython)
INSTALL_TARGETS(/lib/vtk vtkPatentedPython)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
......@@ -59,7 +59,7 @@ IF (VTK_WRAP_JAVA)
ADD_LIBRARY(vtkPatentedJava PatentedJava_SRCS)
TARGET_LINK_LIBRARIES (vtkPatentedJava vtkCommonJava vtkFilteringJava
vtkImagingJava vtkGraphicsJava)
INSTALL_TARGETS(/lib vtkPatentedJava)
INSTALL_TARGETS(/lib/vtk vtkPatentedJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -72,5 +72,5 @@ vtkPatented
)
INSTALL_TARGETS(/lib vtkPatented)
INSTALL_TARGETS(/lib/vtk vtkPatented)
INSTALL_FILES(/include/vtk .h Patented_SRCS)
......@@ -295,7 +295,7 @@ IF (VTK_WRAP_TCL)
TARGET_LINK_LIBRARIES (vtkRenderingTCL ${TK_LIBRARY})
ENDIF (TK_LIBRARY)
INSTALL_TARGETS(/lib vtkRenderingTCL)
INSTALL_TARGETS(/lib/vtk vtkRenderingTCL)
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 (vtkRenderingPython
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
INSTALL_TARGETS(/lib vtkRenderingPython)
INSTALL_TARGETS(/lib/vtk vtkRenderingPython)
IF (TK_LIBRARY)
SOURCE_FILES(RenderingPythonTkWidgets_SRCS
vtkTkWidgetsInit
......@@ -339,7 +339,7 @@ IF (VTK_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkRenderingPythonTkWidgets
${TCL_LIBRARY}
${TK_LIBRARY})
INSTALL_TARGETS(/lib vtkRenderingPythonTkWidgets)
INSTALL_TARGETS(/lib/vtk vtkRenderingPythonTkWidgets)
ENDIF (TK_LIBRARY)
ENDIF (VTK_WRAP_PYTHON)
......@@ -361,7 +361,7 @@ IF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES (vtkRenderingJava ${JAVA_AWT_LIBRARY})
ENDIF (JAVA_AWT_LIBRARY)
INSTALL_TARGETS(/lib vtkRenderingJava)
INSTALL_TARGETS(/lib/vtk vtkRenderingJava)
ENDIF (VTK_WRAP_JAVA)
LINK_LIBRARIES (
......@@ -378,5 +378,9 @@ LINK_LIBRARIES(${CMAKE_X_LIBS})
ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
ENDIF(VTK_USE_X)
INSTALL_TARGETS(/lib vtkRendering)
INSTALL_FILES(/include/vtk .h Rendering_SRCS)
INSTALL_TARGETS(/lib/vtk vtkRendering)
INSTALL_FILES(/include/vtk .h Rendering_SRCS vtkRender)
CONFIGURE_FILE(
${VTK_SOURCE_DIR}/Rendering/tkInternals/.NoDartCoverage
${VTK_BINARY_DIR}/Rendering/tkInternals/.NoDartCoverage)
......@@ -4,7 +4,7 @@
#
IF (USE_INSTALLED_VTK)
IF (VTK_INSTALL_PATH)
LOAD_CACHE(${VTK_INSTALL_PATH}
LOAD_CACHE(${VTK_INSTALL_PATH}/include/vtk
EXCLUDE
BUILD_SHARED_LIBS
BUILD_TESTING
......@@ -15,8 +15,8 @@ IF (USE_INSTALLED_VTK)
VTK_BINARY_DIR
VTK_LIBRARY_PATH
)
INCLUDE_DIRECTORIES ( ${VTK_INSTALL_PATH}/include ${VTK_INSTALL_PATH}/include/vtk )
LINK_DIRECTORIES(${VTK_INSTALL_PATH}/lib)
INCLUDE_DIRECTORIES ( ${VTK_INSTALL_PATH}/include/vtk )
LINK_DIRECTORIES(${VTK_INSTALL_PATH}/lib/vtk)
ENDIF (VTK_INSTALL_PATH)
ELSE (USE_INSTALLED_VTK)
IF (VTK_BINARY_PATH)
......
......@@ -39,3 +39,4 @@ ENDIF (WIN32)
ADD_LIBRARY(vtkjpeg systemdependent_SRCS common_SRCS compression_SRCS decompression_SRCS)
INSTALL_TARGETS(/lib/vtk vtkjpeg)
......@@ -22,3 +22,5 @@ ENDIF(WIN32)
ADD_LIBRARY(png PNG_SRCS)
TARGET_LINK_LIBRARIES(png zlib)
INSTALL_TARGETS(/lib/vtk png)
......@@ -23,3 +23,5 @@ IF(WIN32)
ENDIF(NOT UNIX)
ENDIF(WIN32)
ADD_LIBRARY(zlib ZLIB_SRCS)
INSTALL_TARGETS(/lib/vtk zlib)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment