Commit 35318f20 authored by hkrishna's avatar hkrishna

Merge branch 'fix_vtk_definitions_and_r_support'

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21060 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4feaeaf6
...@@ -112,6 +112,10 @@ SET(REQ_VTK_MODS ...@@ -112,6 +112,10 @@ SET(REQ_VTK_MODS
vtkRenderingFreeTypeOpenGL vtkRenderingFreeTypeOpenGL
vtkRenderingOpenGL) vtkRenderingOpenGL)
IF(R_FOUND)
SET(REQ_VTK_MODS ${REQ_VTK_MODS} vtkFiltersStatisticsGnuR)
ENDIF(R_FOUND)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
LIST(APPEND REQ_VTK_MODS vtkGUISupportQtOpenGL) LIST(APPEND REQ_VTK_MODS vtkGUISupportQtOpenGL)
ENDIF() ENDIF()
......
...@@ -246,7 +246,7 @@ ADD_LIBRARY(avtpipeline_ser ${ALL_SOURCES}) ...@@ -246,7 +246,7 @@ 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}) TARGET_LINK_LIBRARIES(avtpipeline_ser visitcommon ${AVTMATH} avtdbatts lightweight_visit_vtk vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB})
# Add vtk defines # Add vtk defines
ADD_TARGET_DEFINITIONS(avtpipeline_ser ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(avtpipeline_ser "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(avtpipeline_ser) VISIT_INSTALL_TARGETS(avtpipeline_ser)
#********************************* PARALLEL ********************************** #********************************* PARALLEL **********************************
...@@ -254,6 +254,6 @@ IF(VISIT_PARALLEL) ...@@ -254,6 +254,6 @@ IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(avtpipeline_par ${ALL_SOURCES}) 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}) TARGET_LINK_LIBRARIES(avtpipeline_par visitcommon ${AVTMATH} avtdbatts lightweight_visit_vtk vtkCommonCore vtkFiltersGeometry vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle ${ZLIB_LIB})
# Add vtk defines # Add vtk defines
ADD_TARGET_DEFINITIONS(avtpipeline_par ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(avtpipeline_par "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(avtpipeline_par) VISIT_INSTALL_TARGETS(avtpipeline_par)
ENDIF(VISIT_PARALLEL) ENDIF(VISIT_PARALLEL)
...@@ -182,9 +182,13 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_ ...@@ -182,9 +182,13 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_
#********************************* SERIAL ************************************ #********************************* SERIAL ************************************
ADD_LIBRARY(avtplotter_ser ${AVTPLOTTER_SOURCES}) ADD_LIBRARY(avtplotter_ser ${AVTPLOTTER_SOURCES})
TARGET_LINK_LIBRARIES(avtplotter_ser visitcommon avtmath avtview avtfilters_ser avtpipeline_ser visit_vtk lightweight_visit_vtk vtkFiltersHybrid vtkRenderingCore vtkRenderingFreeType vtkRenderingFreeTypeOpenGL ${GLEW_LIB}) IF(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtplotter_ser visitcommon avtmath avtview avtfilters_ser avtpipeline_ser visit_vtk lightweight_visit_vtk vtkFiltersHybrid vtkRenderingCore vtkRenderingFreeType vtkRenderingFreeTypeOpenGL ${GLEW_LIB} vtkFiltersStatisticsGnuR)
ELSE(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtplotter_ser visitcommon avtmath avtview avtfilters_ser avtpipeline_ser visit_vtk lightweight_visit_vtk vtkFiltersHybrid vtkRenderingCore vtkRenderingFreeType vtkRenderingFreeTypeOpenGL ${GLEW_LIB})
ENDIF(HAVE_LIB_R)
# Add vtk defines # Add vtk defines
ADD_TARGET_DEFINITIONS(avtplotter_ser ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(avtplotter_ser "${VTK_DEFINITIONS}")
IF(VISIT_MANTA) IF(VISIT_MANTA)
TARGET_LINK_LIBRARIES(avtplotter_ser ${MANTA_TARGET_LINK_LIBRARIES}) TARGET_LINK_LIBRARIES(avtplotter_ser ${MANTA_TARGET_LINK_LIBRARIES})
ENDIF(VISIT_MANTA) ENDIF(VISIT_MANTA)
...@@ -193,9 +197,13 @@ VISIT_INSTALL_TARGETS(avtplotter_ser) ...@@ -193,9 +197,13 @@ VISIT_INSTALL_TARGETS(avtplotter_ser)
#********************************* PARALLEL ********************************** #********************************* PARALLEL **********************************
IF(VISIT_PARALLEL) IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(avtplotter_par ${AVTPLOTTER_SOURCES}) ADD_PARALLEL_LIBRARY(avtplotter_par ${AVTPLOTTER_SOURCES})
TARGET_LINK_LIBRARIES(avtplotter_par visitcommon avtmath avtview avtfilters_par avtpipeline_par visit_vtk lightweight_visit_vtk vtkFiltersHybrid vtkRenderingCore vtkRenderingFreeType vtkRenderingFreeTypeOpenGL ${GLEW_LIB}) IF(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtplotter_par visitcommon avtmath avtview avtfilters_par avtpipeline_par visit_vtk lightweight_visit_vtk vtkFiltersHybrid vtkRenderingCore vtkRenderingFreeType vtkRenderingFreeTypeOpenGL ${GLEW_LIB} vtkFiltersStatisticsGnuR)
ELSE(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(avtplotter_par visitcommon avtmath avtview avtfilters_par avtpipeline_par visit_vtk lightweight_visit_vtk vtkFiltersHybrid vtkRenderingCore vtkRenderingFreeType vtkRenderingFreeTypeOpenGL ${GLEW_LIB})
ENDIF(HAVE_LIB_R)
# Add vtk defines # Add vtk defines
ADD_TARGET_DEFINITIONS(avtplotter_par ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(avtplotter_par "${VTK_DEFINITIONS}")
IF(VISIT_MANTA) IF(VISIT_MANTA)
TARGET_LINK_LIBRARIES(avtplotter_par ${MANTA_TARGET_LINK_LIBRARIES}) TARGET_LINK_LIBRARIES(avtplotter_par ${MANTA_TARGET_LINK_LIBRARIES})
#IF(ICET_FOUND) #IF(ICET_FOUND)
......
...@@ -59,6 +59,6 @@ ADD_LIBRARY(avtview ${AVTVIEW_SOURCES}) ...@@ -59,6 +59,6 @@ ADD_LIBRARY(avtview ${AVTVIEW_SOURCES})
TARGET_LINK_LIBRARIES(avtview visitcommon vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) TARGET_LINK_LIBRARIES(avtview visitcommon vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
# Add vtk definitions # Add vtk definitions
ADD_TARGET_DEFINITIONS(avtview ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(avtview "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(avtview) VISIT_INSTALL_TARGETS(avtview)
...@@ -128,6 +128,11 @@ Tube ...@@ -128,6 +128,11 @@ Tube
ZoneDump ZoneDump
) )
#adding programmable operator only if Python is available..
#IF(VISIT_PYTHON_FILTERS OR VISIT_PYTHON_SCRIPTING)
# LIST(APPEND REQUIRED_OPERATOR_PLUGINS Script)
#ENDIF(VISIT_PYTHON_FILTERS OR VISIT_PYTHON_SCRIPTING)
IF(TARGET vtkGeovisCore) IF(TARGET vtkGeovisCore)
LIST(APPEND REQUIRED_OPERATOR_PLUGINS CartographicProjection) LIST(APPEND REQUIRED_OPERATOR_PLUGINS CartographicProjection)
ELSE() ELSE()
......
...@@ -55,7 +55,7 @@ ADD_EXECUTABLE(time_annotation time_annotation.C arial_font.C) ...@@ -55,7 +55,7 @@ ADD_EXECUTABLE(time_annotation time_annotation.C arial_font.C)
TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy) TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy)
TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
# add vtk definitions # add vtk definitions
ADD_TARGET_DEFINITIONS(time_annotation ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(text2polys time_annotation) VISIT_INSTALL_TARGETS(text2polys time_annotation)
......
...@@ -124,7 +124,7 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS}) ...@@ -124,7 +124,7 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff) TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff)
# Add vtk definitions # Add vtk definitions
ADD_TARGET_DEFINITIONS(visit_vtk ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(visit_vtk) VISIT_INSTALL_TARGETS(visit_vtk)
...@@ -63,9 +63,13 @@ LINK_DIRECTORIES(${QT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS}) ...@@ -63,9 +63,13 @@ LINK_DIRECTORIES(${QT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS})
ADD_LIBRARY(vtkqt ${VTKQT_SOURCES}) ADD_LIBRARY(vtkqt ${VTKQT_SOURCES})
# Specify the libraries to link against on Windows & Mac # Specify the libraries to link against on Windows & Mac
TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) IF(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
ELSE(HAVE_LIB_R)
TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
ENDIF(HAVE_LIB_R)
# Add vtk definitions # Add vtk definitions
ADD_TARGET_DEFINITIONS(vtkqt ${VTK_DEFINITIONS}) ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}")
VISIT_INSTALL_TARGETS(vtkqt) VISIT_INSTALL_TARGETS(vtkqt)
......
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