Commit 79f48aa6 authored by Brad King's avatar Brad King

ENH: More updates for CMake 1.4.

parent b86bc471
LINK_LIBRARIES (vtkCommon)
#
# Add all the executables
#
......@@ -29,5 +27,6 @@ FOREACH (test
)
ADD_EXECUTABLE(${test} ${test}.cxx)
TARGET_LINK_LIBRARIES(${test} vtkCommon)
ADD_TEST(${test} ${CXX_TEST_PATH}/${test})
ENDFOREACH (test)
......@@ -5,15 +5,12 @@ IF (USE_VTK_FILE)
INCLUDE(${USE_VTK_FILE})
ENDIF (USE_VTK_FILE)
LINK_LIBRARIES(
vtkRendering
vtkGraphics
vtkImaging
vtkFiltering
vtkCommon
)
ADD_EXECUTABLE(Arrays Arrays.cxx)
ADD_EXECUTABLE(Cube Cube.cxx)
ADD_EXECUTABLE(SGrid SGrid.cxx)
ADD_EXECUTABLE(RGrid RGrid.cxx)
TARGET_LINK_LIBRARIES(Arrays vtkRendering)
TARGET_LINK_LIBRARIES(Cube vtkRendering)
TARGET_LINK_LIBRARIES(SGrid vtkRendering)
TARGET_LINK_LIBRARIES(RGrid vtkRendering)
......@@ -5,12 +5,5 @@ IF (USE_VTK_FILE)
INCLUDE(${USE_VTK_FILE})
ENDIF (USE_VTK_FILE)
LINK_LIBRARIES(
vtkRendering
vtkGraphics
vtkImaging
vtkFiltering
vtkCommon
)
ADD_EXECUTABLE(finance finance.cxx)
TARGET_LINK_LIBRARIES(finance vtkRendering)
INCLUDE_REGULAR_EXPRESSION("^(lex|vtk|png|j|Task|Pipe).*$")
# Build a list of libraries to link.
SET(LIBS vtkParallel)
IF (VTK_MANGLE_MESA)
SET(LIBS ${LIBS} ${MESA_LIBRARY})
IF ( MESA_OS_LIBRARY )
SET(LIBS ${LIBS} ${MESA_OS_LIBRARY})
ENDIF ( MESA_OS_LIBRARY )
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
SET(LIBS ${LIBS} ${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF (VTK_MANGLE_MESA)
SET(LIBS ${LIBS} ${OPENGL_LIBRARY})
IF (VTK_USE_X)
SET(LIBS ${LIBS} -lXt)
SET(LIBS ${LIBS} ${CMAKE_X_LIBS})
ENDIF (VTK_USE_X)
IF (VTK_USE_MPI)
IF (MPI_LIBRARY)
SET(LIBS ${LIBS} ${MPI_LIBRARY})
ENDIF (MPI_LIBRARY)
IF (MPI_EXTRA_LIBRARY)
SET(LIBS ${LIBS} ${MPI_EXTRA_LIBRARY})
ENDIF (MPI_EXTRA_LIBRARY)
IF (MPI_INCLUDE_PATH)
INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
ENDIF(MPI_INCLUDE_PATH)
ENDIF (VTK_USE_MPI)
IF (VTK_USE_HYBRID)
ADD_EXECUTABLE(ParallelIso ParallelIso.cxx)
TARGET_LINK_LIBRARIES(ParallelIso vtkHybrid ${LIBS})
TARGET_LINK_LIBRARIES(ParallelIso vtkParallel vtkHybrid)
ENDIF (VTK_USE_HYBRID)
SET(TaskPara_SRCS TaskParallelism.cxx task1.cxx task2.cxx)
......@@ -46,6 +13,6 @@ ADD_EXECUTABLE(TaskParallelism ${TaskPara_SRCS})
ADD_EXECUTABLE(TaskParallelismWithPorts ${TaskParaPorts_SRCS})
ADD_EXECUTABLE(PipelineParallelism ${PipePara_SRCS})
TARGET_LINK_LIBRARIES (TaskParallelism ${LIBS})
TARGET_LINK_LIBRARIES (TaskParallelismWithPorts ${LIBS})
TARGET_LINK_LIBRARIES (PipelineParallelism ${LIBS})
TARGET_LINK_LIBRARIES (TaskParallelism vtkParallel)
TARGET_LINK_LIBRARIES (TaskParallelismWithPorts vtkParallel)
TARGET_LINK_LIBRARIES (PipelineParallelism vtkParallel)
......@@ -5,12 +5,5 @@ IF (USE_VTK_FILE)
INCLUDE(${USE_VTK_FILE})
ENDIF (USE_VTK_FILE)
LINK_LIBRARIES(
vtkRendering
vtkGraphics
vtkImaging
vtkFiltering
vtkCommon
)
ADD_EXECUTABLE(Cylinder Cylinder.cxx)
TARGET_LINK_LIBRARIES(Cylinder vtkRendering)
......@@ -5,12 +5,5 @@ IF (USE_VTK_FILE)
INCLUDE(${USE_VTK_FILE})
ENDIF (USE_VTK_FILE)
LINK_LIBRARIES(
vtkRendering
vtkGraphics
vtkImaging
vtkFiltering
vtkCommon
)
ADD_EXECUTABLE(Cone Cone.cxx)
TARGET_LINK_LIBRARIES(Cone vtkRendering)
......@@ -5,12 +5,5 @@ IF (USE_VTK_FILE)
INCLUDE(${USE_VTK_FILE})
ENDIF (USE_VTK_FILE)
LINK_LIBRARIES(
vtkRendering
vtkGraphics
vtkImaging
vtkFiltering
vtkCommon
)
ADD_EXECUTABLE(Cone2 Cone2.cxx)
TARGET_LINK_LIBRARIES(Cone2 vtkRendering)
LINK_LIBRARIES ( vtkFiltering )
#
# Add all the executables
#
ADD_EXECUTABLE(otherColorTransferFunction otherColorTransferFunction.cxx)
TARGET_LINK_LIBRARIES (otherColorTransferFunction vtkFiltering )
ADD_TEST(otherColorTransferFunction ${CXX_TEST_PATH}/otherColorTransferFunction)
ADD_TEST(otherColorTransferFunction
${CXX_TEST_PATH}/otherColorTransferFunction)
LINK_LIBRARIES (
vtkImaging
vtkGraphics
vtkIO
)
LINK_LIBRARIES( vtkpng vtkzlib vtkjpeg vtktiff )
IF (VTK_USE_RENDERING)
LINK_LIBRARIES (vtkRendering)
LINK_LIBRARIES ( ${OPENGL_LIBRARY} )
IF (VTK_MANGLE_MESA)
IF(NOT MESA_LIBRARY)
MESSAGE("VTK_MANGLE_MESA option requires the path to MESA_LIBRARY to be specified, please edit the cache.")
ELSE(NOT MESA_LIBRARY)
LINK_LIBRARIES( ${MESA_LIBRARY})
ENDIF(NOT MESA_LIBRARY)
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF (VTK_MANGLE_MESA)
IF (VTK_USE_X)
LINK_LIBRARIES(-lXt)
LINK_LIBRARIES(${CMAKE_X_LIBS})
ENDIF (VTK_USE_X)
IF (VTK_USE_FREETYPE)
LINK_LIBRARIES(vtkftgl vtkfreetype)
ENDIF (VTK_USE_FREETYPE)
#
# Add all the executables that require rendering
# Add executable tests with the data
#
ADD_EXECUTABLE(CellLocator CellLocator.cxx)
ADD_EXECUTABLE(PointLocator PointLocator.cxx)
ADD_EXECUTABLE(Mace Mace.cxx)
ADD_EXECUTABLE(expCos expCos.cxx)
ADD_EXECUTABLE(volProt volProt.cxx)
ADD_EXECUTABLE(RGrid RGrid.cxx)
ADD_EXECUTABLE(FrustumClip FrustumClip.cxx)
#
# Add tests, with the data
#
IF (VTK_DATA_ROOT)
ADD_TEST(CellLocator-image ${CXX_TEST_PATH}/CellLocator
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/CellLocator.png)
ADD_TEST(Mace-image ${CXX_TEST_PATH}/Mace
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/Mace.png)
ADD_TEST(PointLocator-image ${CXX_TEST_PATH}/PointLocator
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/PointLocator.png)
ADD_TEST(expCos-image ${CXX_TEST_PATH}/expCos
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/expCos.png)
ADD_TEST(volProt-image ${CXX_TEST_PATH}/volProt
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/volProt.png)
ADD_TEST(RGrid-image ${CXX_TEST_PATH}/RGrid
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/RGrid.png)
ADD_TEST(FrustumClip-image ${CXX_TEST_PATH}/FrustumClip
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/FrustumClip.png)
ELSE (VTK_DATA_ROOT)
ADD_TEST(Mace ${CXX_TEST_PATH}/Mace )
ADD_TEST(RGrid ${CXX_TEST_PATH}/RGrid )
ADD_TEST(expCos ${CXX_TEST_PATH}/expCos )
ADD_TEST(CellLocator ${CXX_TEST_PATH}/CellLocator)
ADD_TEST(PointLocator ${CXX_TEST_PATH}/PointLocator)
ADD_TEST(FrustumClip ${CXX_TEST_PATH}/FrustumClip)
ENDIF (VTK_DATA_ROOT)
FOREACH(test CellLocator
PointLocator
Mace
expCos
volProt
RGrid
FrustumClip)
ADD_EXECUTABLE(${test} ${test}.cxx)
TARGET_LINK_LIBRARIES(${test} vtkRendering vtkIO)
IF (VTK_DATA_ROOT)
ADD_TEST(${test}-image ${CXX_TEST_PATH}/${test}
-D ${VTK_DATA_ROOT}
-V Baseline/Graphics/${test}.png)
ELSE (VTK_DATA_ROOT)
ADD_TEST(${test} ${CXX_TEST_PATH}/${test})
ENDIF (VTK_DATA_ROOT)
ENDFOREACH(test)
ENDIF (VTK_USE_RENDERING)
IF (VTK_USE_RENDERING)
# Build a list of libraries to link.
SET(LIBS vtkHybrid ${OPENGL_LIBRARY})
IF (VTK_MANGLE_MESA)
IF(NOT MESA_LIBRARY)
MESSAGE("VTK_MANGLE_MESA option requires the path to MESA_LIBRARY to be specified, please edit the cache.")
ELSE(NOT MESA_LIBRARY)
SET(LIBS ${LIBS} ${MESA_LIBRARY})
ENDIF(NOT MESA_LIBRARY)
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
SET(LIBS ${LIBS} ${MESA_LIBRARY} ${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF (VTK_MANGLE_MESA)
IF (VTK_USE_X)
SET(LIBS ${LIBS} -lXt ${CMAKE_X_LIBS})
ENDIF (VTK_USE_X)
IF (VTK_USE_FREETYPE)
SET(LIBS ${LIBS} vtkftgl vtkfreetype)
ENDIF (VTK_USE_FREETYPE)
#
# Add all the executables that require rendering
#
......@@ -27,9 +6,9 @@ IF (VTK_USE_RENDERING)
ADD_EXECUTABLE(ImagePlaneWidget ImagePlaneWidget.cxx)
ADD_EXECUTABLE(AmoebaMinimizer AmoebaMinimizer.cxx)
TARGET_LINK_LIBRARIES(BoxWidget ${LIBS})
TARGET_LINK_LIBRARIES(ImagePlaneWidget ${LIBS})
TARGET_LINK_LIBRARIES(AmoebaMinimizer ${LIBS})
TARGET_LINK_LIBRARIES(BoxWidget vtkHybrid)
TARGET_LINK_LIBRARIES(ImagePlaneWidget vtkHybrid)
TARGET_LINK_LIBRARIES(AmoebaMinimizer vtkHybrid)
#
# Add tests, with the data
......
LINK_LIBRARIES (vtkIO)
LINK_LIBRARIES( vtkpng vtkzlib vtkjpeg vtkexpat )
ADD_EXECUTABLE(TestXML TestXML.cxx)
ADD_TEST(TestXML ${CXX_TEST_PATH}/TestXML ${VTK_DATA_ROOT}/Data/sample.xml)
TARGET_LINK_LIBRARIES (TestXML vtkIO)
ADD_TEST(TestXML ${CXX_TEST_PATH}/TestXML ${VTK_DATA_ROOT}/Data/sample.xml)
LINK_LIBRARIES (
vtkIO
vtkImaging
vtkGraphics
)
LINK_LIBRARIES( vtkpng vtkzlib vtkjpeg vtktiff )
IF (VTK_USE_RENDERING)
LINK_LIBRARIES (vtkRendering)
LINK_LIBRARIES ( ${OPENGL_LIBRARY} )
IF (VTK_MANGLE_MESA)
LINK_LIBRARIES( ${MESA_LIBRARY} )
IF (MESA_OS_LIBRARY)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY)
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF (VTK_MANGLE_MESA)
IF (VTK_USE_X)
LINK_LIBRARIES(-lXt)
LINK_LIBRARIES(${CMAKE_X_LIBS})
ENDIF (VTK_USE_X)
IF (VTK_USE_FREETYPE)
LINK_LIBRARIES(vtkftgl vtkfreetype)
ENDIF (VTK_USE_FREETYPE)
#
# Add all the executables that require rendering
#
ADD_EXECUTABLE(ImportExport ImportExport.cxx)
TARGET_LINK_LIBRARIES(ImportExport vtkRendering vtkIO)
#
# Add tests, with the data
#
......
LINK_LIBRARIES (
vtkParallel
vtkRendering
vtkIO
vtkGraphics
vtkImaging
vtkFiltering
vtkCommon
)
LINK_LIBRARIES( vtkpng vtkzlib vtkjpeg vtktiff)
IF (VTK_USE_FREETYPE)
LINK_LIBRARIES(vtkftgl vtkfreetype)
ENDIF (VTK_USE_FREETYPE)
IF (VTK_USE_HYBRID)
ADD_EXECUTABLE(ParallelIsoTest ParallelIso.cxx)
TARGET_LINK_LIBRARIES(ParallelIsoTest vtkHybrid)
ADD_EXECUTABLE(ParallelIsoTest ParallelIso.cxx)
TARGET_LINK_LIBRARIES(ParallelIsoTest vtkParallel vtkHybrid)
ENDIF (VTK_USE_HYBRID)
ADD_EXECUTABLE(SocketServer SocketServer.cxx)
ADD_EXECUTABLE(SocketClient SocketClient.cxx)
ADD_EXECUTABLE(GenericCommunicator GenericCommunicator.cxx)
ADD_EXECUTABLE(ThreadedCommunicator ThreadedCommunicator.cxx)
IF (VTK_USE_MPI)
ADD_EXECUTABLE(MPIGroups MPIGroups.cxx)
ENDIF (VTK_USE_MPI)
LINK_LIBRARIES ( ${OPENGL_LIBRARY} )
IF (VTK_MANGLE_MESA)
LINK_LIBRARIES( ${MESA_LIBRARY})
IF (MESA_OS_LIBRARY)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY)
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF (VTK_MANGLE_MESA)
IF (VTK_USE_X)
LINK_LIBRARIES(-lXt)
LINK_LIBRARIES(${CMAKE_X_LIBS})
ENDIF (VTK_USE_X)
TARGET_LINK_LIBRARIES(SocketServer vtkParallel)
TARGET_LINK_LIBRARIES(SocketClient vtkParallel)
TARGET_LINK_LIBRARIES(GenericCommunicator vtkParallel)
TARGET_LINK_LIBRARIES(ThreadedCommunicator vtkParallel)
IF (VTK_USE_MPI)
IF (MPI_LIBRARY)
LINK_LIBRARIES (${MPI_LIBRARY})
ENDIF (MPI_LIBRARY)
IF (MPI_INCLUDE_PATH)
INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
ENDIF(MPI_INCLUDE_PATH)
IF (MPI_EXTRA_LIBRARY)
LINK_LIBRARIES (${MPI_EXTRA_LIBRARY})
ENDIF (MPI_EXTRA_LIBRARY)
ADD_EXECUTABLE(MPIGroups MPIGroups.cxx)
TARGET_LINK_LIBRARIES(MPIGroups vtkParallel)
ENDIF (VTK_USE_MPI)
#
......
......@@ -178,13 +178,15 @@ vtkVolumeTextureMapper
ABSTRACT
)
IF(VTK_USE_X)
SET( Rendering_SRCS ${Rendering_SRCS}
vtkXRenderWindowInteractor.cxx
vtkXTextMapper.cxx)
ENDIF(VTK_USE_X)
# Build a list of libraries to link to vtkRendering.
SET(Rendering_LIBS vtkGraphics vtkImaging)
IF (WIN32)
SET(HAVE_OPENGL_SRCS ON)
SET(RenderingOpenGL_SRCS ${RenderingOpenGL_SRCS}
......@@ -192,7 +194,7 @@ IF (WIN32)
vtkWin32RenderWindowInteractor.cxx
vtkWin32OpenGLTextMapper.cxx
vtkWin32TextMapper.cxx)
LINK_LIBRARIES ( ${OPENGL_LIBRARY} )
SET (Rendering_LIBS ${Rendering_LIBS} ${OPENGL_LIBRARY} )
ELSE (WIN32)
IF (APPLE)
IF(VTK_USE_COCOA)
......@@ -204,7 +206,7 @@ ELSE (WIN32)
vtkCocoaWindow.mm
vtkCocoaGLView.mm)
SET_SOURCE_FILES_PROPERTIES(vtkCocoaGLView vtkCocoaWindow WRAP_EXCLUDE)
LINK_LIBRARIES (${OPENGL_LIBRARY} )
SET (Rendering_LIBS ${Rendering_LIBS} ${OPENGL_LIBRARY} )
ENDIF(VTK_USE_COCOA)
IF(VTK_USE_CARBON)
SET(HAVE_OPENGL_SRCS ON)
......@@ -212,7 +214,7 @@ ELSE (WIN32)
vtkCarbonTextMapper.cxx
vtkCarbonRenderWindowInteractor.cxx
vtkCarbonRenderWindow.cxx)
LINK_LIBRARIES (${OPENGL_LIBRARY} )
SET (Rendering_LIBS ${Rendering_LIBS} ${OPENGL_LIBRARY} )
ENDIF(VTK_USE_CARBON)
IF(VTK_USE_X)
IF (OPENGL_LIBRARY)
......@@ -221,7 +223,7 @@ ELSE (WIN32)
vtkXOpenGLRenderWindow.cxx
vtkXOpenGLTextMapper.cxx)
SET_SOURCE_FILES_PROPERTIES(vtkXTextMapper ABSTRACT)
LINK_LIBRARIES (${OPENGL_LIBRARY} )
SET (Rendering_LIBS ${Rendering_LIBS} ${OPENGL_LIBRARY} )
ENDIF (OPENGL_LIBRARY)
ENDIF(VTK_USE_X)
ELSE (APPLE)
......@@ -231,7 +233,7 @@ ELSE (WIN32)
vtkXOpenGLRenderWindow.cxx
vtkXOpenGLTextMapper.cxx)
SET_SOURCE_FILES_PROPERTIES( vtkXTextMapper ABSTRACT )
LINK_LIBRARIES (${OPENGL_LIBRARY} )
SET (Rendering_LIBS ${Rendering_LIBS} ${OPENGL_LIBRARY} )
ENDIF (OPENGL_LIBRARY)
ENDIF (APPLE)
ENDIF (WIN32)
......@@ -257,9 +259,9 @@ IF (VTK_MANGLE_MESA)
vtkXMesaTextMapper.cxx
)
SET_SOURCE_FILES_PROPERTIES(vtkMesaRenderWindow ABSTRACT)
LINK_LIBRARIES (${MESA_LIBRARY})
SET (Rendering_LIBS ${Rendering_LIBS} ${MESA_LIBRARY})
IF(MESA_OS_LIBRARY)
LINK_LIBRARIES( ${MESA_OS_LIBRARY} )
SET( Rendering_LIBS ${Rendering_LIBS} ${MESA_OS_LIBRARY} )
ENDIF(MESA_OS_LIBRARY)
IF (MESA_INCLUDE_PATH)
INCLUDE_DIRECTORIES(${MESA_INCLUDE_PATH})
......@@ -267,7 +269,7 @@ IF (VTK_MANGLE_MESA)
ENDIF (MESA_LIBRARY)
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
SET(Rendering_LIBS ${Rendering_LIBS} ${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF(VTK_MANGLE_MESA)
......@@ -289,12 +291,13 @@ ELSE(HAVE_OPENGL_SRCS)
ENDIF(HAVE_OPENGL_SRCS)
INSTALL_FILES(/include/vtk .h ${VTK_BINARY_DIR}/vtkRenderingInstantiator)
TARGET_LINK_LIBRARIES(vtkRendering ${Rendering_LIBS})
# Allow the user to customize their build with some local options
#
INCLUDE (${VTK_BINARY_DIR}/Rendering/LocalUserOptions.cmake OPTIONAL)
INCLUDE (${VTK_SOURCE_DIR}/Rendering/LocalUserOptions.cmake OPTIONAL)
TARGET_LINK_LIBRARIES (vtkRendering vtkIO vtkGraphics vtkImaging)
IF (VTK_USE_FREETYPE)
TARGET_LINK_LIBRARIES(vtkRendering
vtkftgl
......@@ -425,9 +428,7 @@ IF (VTK_WRAP_PYTHON)
ADD_LIBRARY(vtkRenderingPython SHARED RenderingPython_SRCS)
TARGET_LINK_LIBRARIES (vtkRenderingPython
vtkGraphicsPython
vtkImagingPython
vtkFilteringPython
vtkCommonPython)
vtkImagingPython)
ENDIF (APPLE)
IF(WIN32)
......@@ -440,13 +441,13 @@ IF (VTK_WRAP_PYTHON)
INSTALL_TARGETS(/lib/vtk vtkRenderingPython)
IF (TK_LIBRARY)
SOURCE_FILES(RenderingPythonTkWidgets_SRCS
SET(RenderingPythonTkWidgets_SRCS
vtkTkWidgetsInit.cxx
vtkTkRenderWidgetPython.cxx
vtkTkImageViewerWidgetPython.cxx
)
ADD_LIBRARY(vtkRenderingPythonTkWidgets SHARED
RenderingPythonTkWidgets_SRCS)
${RenderingPythonTkWidgets_SRCS})
TARGET_LINK_LIBRARIES (vtkRenderingPythonTkWidgets
${TCL_LIBRARY}
${TK_LIBRARY})
......@@ -494,8 +495,6 @@ IF (VTK_WRAP_JAVA)
Rendering_SRCS)
ADD_LIBRARY(vtkRenderingJava SHARED RenderingJava_SRCS)
TARGET_LINK_LIBRARIES (vtkRenderingJava
vtkCommonJava
vtkFilteringJava
vtkImagingJava
vtkGraphicsJava)
IF (JAVA_AWT_LIBRARY)
......@@ -507,8 +506,7 @@ ENDIF (VTK_WRAP_JAVA)
IF(VTK_USE_X)
LINK_LIBRARIES(-lXt)
LINK_LIBRARIES(${CMAKE_X_LIBS})
TARGET_LINK_LIBRARIES(vtkRendering -lXt ${CMAKE_X_LIBS})
ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
ENDIF(VTK_USE_X)
......
LINK_LIBRARIES (vtkIO vtkRendering)
LINK_LIBRARIES ( ${OPENGL_LIBRARY} )
IF (VTK_MANGLE_MESA)
LINK_LIBRARIES( ${MESA_LIBRARY})
IF ( MESA_OS_LIBRARY )
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF ( MESA_OS_LIBRARY )
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF (VTK_MANGLE_MESA)
IF (VTK_USE_X)
LINK_LIBRARIES(-lXt)
LINK_LIBRARIES(${CMAKE_X_LIBS})
ENDIF (VTK_USE_X)
#
# Add all the executables that require rendering
#
ADD_EXECUTABLE(TimeRenderer TimeRenderer.cxx)
ADD_EXECUTABLE(TimeRenderer2 TimeRenderer2.cxx)
ADD_EXECUTABLE(otherCoordinate otherCoordinate.cxx)
ADD_EXECUTABLE(TestRenderWindow TestRenderWindow.cxx)
FOREACH (exe
TimeRenderer
TimeRenderer2
otherCoordinate
TestRenderWindow
)
ADD_EXECUTABLE(${exe} ${exe}.cxx)
TARGET_LINK_LIBRARIES(${exe} vtkRendering vtkIO)
ENDFOREACH (exe)
ADD_TEST(otherCoordinate ${CXX_TEST_PATH}/otherCoordinate)
......
......@@ -3,100 +3,52 @@ CONFIGURE_FILE(
${VTK_SOURCE_DIR}/Wrapping/Tcl/tkAppInit.cxx.in
${VTK_BINARY_DIR}/Wrapping/Tcl/tkAppInit.cxx)
SET(LIBS
vtkImagingTCL
vtkGraphicsTCL
vtkIOTCL
vtkIO
vtkGraphics
vtkImaging
)
IF (TCL_LIBRARY)
LINK_LIBRARIES (${TCL_LIBRARY})
SET(LIBS ${LIBS} ${TCL_LIBRARY})
ELSE (TCL_LIBRARY)
MESSAGE("VTK_WRAP_TCL is ON, but the Tcl library was not found. Please set TCL_LIBRARY." "Error")
ENDIF (TCL_LIBRARY)
IF (VTK_USE_RENDERING)
# add in opengl
IF (WIN32)
LINK_LIBRARIES ( ${OPENGL_LIBRARY} )
ELSE (WIN32)
IF (OPENGL_LIBRARY)
LINK_LIBRARIES (${OPENGL_LIBRARY})
ENDIF (OPENGL_LIBRARY)
ENDIF (WIN32)
IF (VTK_MANGLE_MESA)
LINK_LIBRARIES( ${MESA_LIBRARY})
IF ( MESA_OS_LIBRARY )
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF ( MESA_OS_LIBRARY )
ELSE (VTK_MANGLE_MESA)
IF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
LINK_LIBRARIES(${MESA_OS_LIBRARY})
ENDIF (MESA_OS_LIBRARY AND VTK_OPENGL_HAS_OSMESA)
ENDIF (VTK_MANGLE_MESA)
# add in the Tk values if found
IF (TK_INCLUDE_PATH)
INCLUDE_DIRECTORIES(${TK_INCLUDE_PATH})
IF (APPLE)
INCLUDE_DIRECTORIES(${VTK_SOURCE_DIR}/Rendering/tkOSXInternals)
ENDIF (APPLE)
ENDIF (TK_INCLUDE_PATH)
IF (TK_XLIB_PATH)
INCLUDE_DIRECTORIES(${TK_XLIB_PATH})
ENDIF (TK_XLIB_PATH)
IF (TK_LIBRARY)
LINK_LIBRARIES (${TK_LIBRARY})
ELSE (TK_LIBRARY)
MESSAGE("VTK_WRAP_TCL and VTK_USE_RENDERING are ON, but the Tk library was not found. Please set TK_LIBRARY." "Error")
ENDIF (TK_LIBRARY)
# IF (TK_INCLUDE_PATH)
# INCLUDE_DIRECTORIES(${TK_INCLUDE_PATH})
# IF (APPLE)
# INCLUDE_DIRECTORIES(${VTK_SOURCE_DIR}/Rendering/tkOSXInternals)
# ENDIF (APPLE)
# ENDIF (TK_INCLUDE_PATH)
# IF (TK_XLIB_PATH)
# INCLUDE_DIRECTORIES(${TK_XLIB_PATH})
# ENDIF (TK_XLIB_PATH)
# add in xwindows stuff
IF (VTK_USE_X)
LINK_LIBRARIES(-lXt)
LINK_LIBRARIES(${CMAKE_X_LIBS})
ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
ENDIF (VTK_USE_X)
# add in freetype
IF (VTK_USE_FREETYPE)
LINK_LIBRARIES(
vtkftgl
vtkfreetype
)
ENDIF (VTK_USE_FREETYPE)
LINK_LIBRARIES(vtkRenderingTCL vtkRendering)
# IF (VTK_USE_X)
# ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
# ENDIF (VTK_USE_X)
SET(LIBS ${LIBS} vtkRenderingTCL vtkRendering)
ENDIF (VTK_USE_RENDERING)
IF (VTK_USE_PATENTED)
LINK_LIBRARIES(vtkPatentedTCL vtkPatented)
SET(LIBS ${LIBS} vtkPatentedTCL vtkPatented)
ENDIF (VTK_USE_PATENTED)
IF (VTK_USE_HYBRID)
LINK_LIBRARIES(vtkHybridTCL vtkHybrid)
IF (WIN32)
IF (VTK_USE_VIDEO_FOR_WINDOWS)
LINK_LIBRARIES (vfw32)
ENDIF (VTK_USE_VIDEO_FOR_WINDOWS)
IF (VTK_USE_MATROX_IMAGING)
LINK_LIBRARIES (${MIL_LIBRARY})
ENDIF (VTK_USE_MATROX_IMAGING)
ENDIF (WIN32)
SET(LIBS ${LIBS} vtkHybridTCL vtkHybrid)
ENDIF (VTK_USE_HYBRID)
IF (VTK_USE_PARALLEL)
LINK_LIBRARIES(vtkParallelTCL vtkParallel)
IF (WIN32)
LINK_LIBRARIES( wsock32 )
ENDIF (WIN32)
IF (VTK_USE_MPI)
INCLUDE (${CMAKE_ROOT}/Modules/FindMPI.cmake)
IF (MPI_LIBRARY)
LINK_LIBRARIES (${MPI_LIBRARY})
ENDIF (MPI_LIBRARY)
IF (MPI_EXTRA_LIBRARY)
LINK_LIBRARIES (${MPI_EXTRA_LIBRARY})
ENDIF (MPI_EXTRA_LIBRARY)
ENDIF (VTK_USE_MPI)
SET(LIBS ${LIBS} vtkParallelTCL vtkParallel)
ENDIF (VTK_USE_PARALLEL)
#
......@@ -104,14 +56,7 @@ ENDIF (VTK_USE_PARALLEL)
#
ADD_EXECUTABLE(vtk ${VTK_BINARY_DIR}/Wrapping/Tcl/tkAppInit.cxx)
TARGET_LINK_LIBRARIES (vtk
vtkImagingTCL
vtkGraphicsTCL
vtkIOTCL
vtkIO
vtkGraphics
vtkImaging