Fix SLIVR build, get rid of Tuvok option when not built.

Merge from 2.0RC.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11138 18c085ea-50e0-402c-830e-de6fd14e8384

CMakeLists.txt

@@ -109,6 +109,9 @@
 #    Small change to rpath detection to avoid cmake error w/
 #    LIST(REMOVE_DUPLCIATES) if no rpaths are found.
 #
+#    Tom Fogal, Fri Apr 30 09:35:51 MDT 2010
+#    Define HAVE_LIBSLIVR as appropriate.
+#
 #****************************************************************************/
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
@@ -619,6 +622,7 @@ IF(VISIT_SLIVR)
     SET(SLIVR_GUI_IMPL QvisCMap2Display.C QvisCMap2Widget.C)
     SET(SLIVR_GUI_HDR QvisCMap2Display.h QvisCMap2Widget.h)
     SET(SLIVR_LIB slivrG slivrV)
+    ADD_DEFINITIONS(-DHAVE_LIBSLIVR)
 ENDIF(VISIT_SLIVR)
 
 # Include Ice-T support if we can.

plots/Volume/QvisVolumePlotWindow.C

@@ -752,9 +752,11 @@ QvisVolumePlotWindow::CreateOptions(int maxWidth)
     rendererTypesComboBox->addItem(tr("3D Texturing"));
     rendererTypesComboBox->addItem(tr("Ray casting: compositing"));
     rendererTypesComboBox->addItem(tr("Ray casting: integration (grey scale)"));
-    rendererTypesComboBox->addItem(tr("SCI, University of Utah (Tuvok)"));
+#ifdef USE_TUVOK
+    rendererTypesComboBox->addItem(tr("Tuvok"));
+#endif
 #ifdef HAVE_LIBSLIVR
-    rendererTypesComboBox->addItem(tr("SCI, University of Utah (SLIVR)"));
+    rendererTypesComboBox->addItem(tr("SLIVR"));
 #endif
     connect(rendererTypesComboBox, SIGNAL(activated(int)),
             this, SLOT(rendererTypeChanged(int)));

third_party_builtin/slivr/teem-1.9.0-src/CMakeLists.txt

@@ -147,9 +147,9 @@ ENDIF(QNANHIBIT)
 ADD_DEFINITIONS(-DTEEM_DIO=0)
 #ENDIF(USE_DIRECTIO)
 
-SET(TEEM_LIBRARIES air hest biff nrrd ell unrrdu dye moss gage bane
-  limn hoover alan echo ten
-  mite coil push CACHE INTERNAL "TEEM libraries")
+SET(TEEM_LIBRARIES air hest biff nrrd ell unrrdu dye moss gage
+  alan
+  CACHE INTERNAL "TEEM libraries")
 
 SET(TEEM_INSTALLED_HEADER_FILES)
 FOREACH(header_file
@@ -165,19 +165,11 @@ FOREACH(header_file
     unrrdu/unrrdu.h
     dye/dye.h
     alan/alan.h
-    limn/limn.h
     gage/gage.h
     moss/moss.h
-    echo/echo.h
-    bane/bane.h
-    ten/ten.h
-    ten/tenMacros.h
-    hoover/hoover.h
-    mite/mite.h
     nrrd/nrrdDefines.h
     nrrd/nrrdMacros.h
     nrrd/nrrdEnums.h
-    push/push.h
     )
   # When debugging, uncomment this line
   #MESSAGE(STATUS "Copy header file: ${header_file}")