Commit 87185055 authored by hkrishna's avatar hkrishna

missed a couple of changes VTK-R infrastructure changes in merge

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21061 18c085ea-50e0-402c-830e-de6fd14e8384
parent 35318f20
......@@ -244,7 +244,11 @@ ENDIF(NOT VISIT_DBIO_ONLY)
#********************************* SERIAL ************************************
ADD_LIBRARY(avtpipeline_ser ${ALL_SOURCES})
TARGET_LINK_LIBRARIES(avtpipeline_ser visitcommon ${AVTMATH} avtdbatts lightweight_visit_vtk vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB})
IF(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtpipeline_ser visitcommon ${AVTMATH} avtdbatts lightweight_visit_vtk vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB} vtkFiltersStatisticsGnuR)
ELSE(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtpipeline_ser visitcommon ${AVTMATH} avtdbatts lightweight_visit_vtk vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB})
ENDIF(HAVE_LIB_R)
# Add vtk defines
ADD_TARGET_DEFINITIONS(avtpipeline_ser "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(avtpipeline_ser)
......@@ -252,7 +256,11 @@ 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 vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB})
IF(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtpipeline_par visitcommon ${AVTMATH} avtdbatts lightweight_visit_vtk vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB} vtkFiltersStatisticsGnuR)
ELSE(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtpipeline_par visitcommon ${AVTMATH} avtdbatts lightweight_visit_vtk vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB})
ENDIF(HAVE_LIB_R)
# Add vtk defines
ADD_TARGET_DEFINITIONS(avtpipeline_par "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(avtpipeline_par)
......
......@@ -53,7 +53,11 @@ ADD_EXECUTABLE(time_annotation time_annotation.C arial_font.C)
# Specify the libraries to link against
TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy)
IF(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
ELSE(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
ENDIF(HAVE_LIB_R)
# add vtk definitions
ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}")
......
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