Commit 7bdcd12a authored by Chris Harris's avatar Chris Harris

Update target_link_libraries(...) calls to link to appropriate VTK module

Change kit libaries to the appropriate VTK module.
parent 71bfa022
......@@ -51,16 +51,16 @@ PVVTK_ADD_LIBRARY(vtkVisItAVTAlgorithms ${Kit_SRCS})
## NOTE: Always link to vtkParallel b/c it is needed for using vtkAMRUtilities
## When creating vtkOverlappingAMR datasets (especially on windows)
IF(VISIT_PARALLEL)
TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_par avtpipeline_par visit_vtk avtivp vtkParallel)
TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_par avtpipeline_par visit_vtk avtivp vtkAMRCore)
ELSE(VISIT_PARALLEL)
TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser visit_vtk avtivp vtkParallel)
TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser visit_vtk avtivp vtkAMRCore)
ENDIF(VISIT_PARALLEL)
#Wrap for Python
#-------------------------------------------------------------------------------------------------
IF (PARAVIEW_ENABLE_PYTHON)
SET(Kit_PYTHON_EXTRA_SRCS)
SET(KIT_PYTHON_LIBS vtkVisItAVTAlgorithmsPythonD vtkIOPythonD vtkVisItAVTAlgorithmsCS)
SET(KIT_PYTHON_LIBS vtkVisItAVTAlgorithmsPythonD vtkIOCorePythonD vtkVisItAVTAlgorithmsCS)
# Tell vtkWrapPython.cmake to set VTK_PYTHON_LIBRARIES for us.
SET(VTK_WRAP_PYTHON_FIND_LIBS 1)
SET(VTK_WRAP_INCLUDE_DIRS ${VTK_INCLUDE_DIR})
......@@ -83,4 +83,4 @@ ENDIF (PARAVIEW_ENABLE_PYTHON)
#Install
#-------------------------------------------------------------------------------------------------
VISIT_INSTALL_TARGETS(vtkVisItAVTAlgorithms)
\ No newline at end of file
VISIT_INSTALL_TARGETS(vtkVisItAVTAlgorithms)
......@@ -62,6 +62,6 @@ ${VTK_INCLUDE_DIRS}
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
PVVTK_ADD_LIBRARY(avtivp ${AVTIVP_SOURCES})
TARGET_LINK_LIBRARIES(avtivp avtmath visitcommon visit_vtk vtkCommon vtkFiltering)
TARGET_LINK_LIBRARIES(avtivp avtmath visitcommon visit_vtk vtkCommonCore vtkFiltersGeneral)
VISIT_INSTALL_TARGETS(avtivp)
......@@ -60,6 +60,6 @@ ${VTK_INCLUDE_DIRS}
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
PVVTK_ADD_LIBRARY(avtmath ${AVTMATH_SOURCES})
TARGET_LINK_LIBRARIES(avtmath visitcommon vtkCommon)
TARGET_LINK_LIBRARIES(avtmath visitcommon vtkCommonCore)
VISIT_INSTALL_TARGETS(avtmath)
......@@ -225,12 +225,12 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
#********************************* SERIAL ************************************
PVVTK_ADD_LIBRARY(avtpipeline_ser ${ALL_SOURCES})
TARGET_LINK_LIBRARIES(avtpipeline_ser visitcommon avtmath avtdbatts lightweight_visit_vtk vtkGraphics ${ZLIB_LIB})
TARGET_LINK_LIBRARIES(avtpipeline_ser visitcommon avtmath avtdbatts lightweight_visit_vtk ${ZLIB_LIB})
VISIT_INSTALL_TARGETS(avtpipeline_ser)
#********************************* PARALLEL **********************************
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(avtpipeline_par ${ALL_SOURCES})
TARGET_LINK_LIBRARIES(avtpipeline_par visitcommon avtmath avtdbatts lightweight_visit_vtk vtkGraphics ${ZLIB_LIB})
TARGET_LINK_LIBRARIES(avtpipeline_par visitcommon avtmath avtdbatts lightweight_visit_vtk ${ZLIB_LIB})
VISIT_INSTALL_TARGETS(avtpipeline_par)
ENDIF(VISIT_PARALLEL)
......@@ -75,4 +75,4 @@ ADD_VISIT_INTERFACE_READER(VisItNETCDF "1.0"
VISIT_INTERFACE_FILE ${INTERFACE_MACRO_FILE}
VISIT_INTERFACE_EXEMPT_CLASSES ${INTERFACE_EXEMPT_CLASSES}
SERVER_SOURCES ${SOURCES}
)
\ No newline at end of file
)
......@@ -115,6 +115,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
"${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}")
PVVTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging ${VTK_TIFF_LIBRARIES})
TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkImagingCore ${VTK_TIFF_LIBRARIES})
VISIT_INSTALL_TARGETS(visit_vtk)
......@@ -78,6 +78,6 @@ PVVTK_ADD_LIBRARY(lightweight_visit_vtk
${LIGHTWEIGHT_VISIT_VTK_SOURCES}
)
TARGET_LINK_LIBRARIES(lightweight_visit_vtk visitcommon vtkCommon vtkFiltering vtkIO)
TARGET_LINK_LIBRARIES(lightweight_visit_vtk visitcommon vtkCommonCore vtkFiltersGeneral vtkIOCore)
VISIT_INSTALL_TARGETS(lightweight_visit_vtk)
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