Merge pull request #1267 from UV-CDAT/issue_903_turn_off_paraview

Issue 903 turn off paraview
CDAT · May 7, 2015 · 8a9b545 · 8a9b545
2 parents 94f63d6 + 5c2baa4
commit 8a9b545
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMake/cdat_modules/cdat_deps.cmake b/CMake/cdat_modules/cdat_deps.cmake
@@ -2,7 +2,7 @@ set(CDAT_deps ${wget_pkg} ${python_pkg} ${numpy_pkg}
               ${libcdms_pkg}
               ${libcf_pkg} ${netcdf_pkg} ${myproxyclient_pkg} ${udunits2_pkg})
 if (CDAT_BUILD_GRAPHICS)
-  if (CDAT_BUILD_PARALLEL)
+  if (CDAT_BUILD_PARAVIEW)
     list(APPEND CDAT_deps ${paraview_pkg})
   else()
     list(APPEND CDAT_deps ${vtk_pkg})

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -284,6 +284,7 @@ option(CDAT_BUILD_GUI "Builds GUI-based dependencies (Vistrails, ParaView, VisIt
 option(CDAT_BUILD_GRAPHICS "Build graphics-based dependencies (vcs, pyqt, Vistrails, ParaView, VisIt, R, etc.) " ON)
 option(CDAT_BUILD_ESGF "Alias for CDAT_BUILD_LEAN" OFF)
 option(CDAT_BUILD_UVCMETRICSPKG "Builds uvcmetrics package " ON)
+option(CDAT_BUILD_PARAVIEW "Build ParaView rather than just VTK" OFF)
 
 # If ESGF option is on then our build mode is LEAN.
 if (CDAT_BUILD_ESGF)
@@ -498,7 +499,7 @@ include(osmesa_pkg)
 include(python_pkg)
 include(seawater_pkg)
 include(vacumm_pkg)
-if (CDAT_BUILD_PARALLEL)
+if (CDAT_BUILD_PARAVIEW)
   include(paraview_pkg)
 else()
   include(vtk_pkg)