Skip to content

Commit 8a9b545

Browse files
committed
Merge pull request #1267 from UV-CDAT/issue_903_turn_off_paraview
Issue 903 turn off paraview
2 parents 94f63d6 + 5c2baa4 commit 8a9b545

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CMake/cdat_modules/cdat_deps.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(CDAT_deps ${wget_pkg} ${python_pkg} ${numpy_pkg}
22
${libcdms_pkg}
33
${libcf_pkg} ${netcdf_pkg} ${myproxyclient_pkg} ${udunits2_pkg})
44
if (CDAT_BUILD_GRAPHICS)
5-
if (CDAT_BUILD_PARALLEL)
5+
if (CDAT_BUILD_PARAVIEW)
66
list(APPEND CDAT_deps ${paraview_pkg})
77
else()
88
list(APPEND CDAT_deps ${vtk_pkg})

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ option(CDAT_BUILD_GUI "Builds GUI-based dependencies (Vistrails, ParaView, VisIt
284284
option(CDAT_BUILD_GRAPHICS "Build graphics-based dependencies (vcs, pyqt, Vistrails, ParaView, VisIt, R, etc.) " ON)
285285
option(CDAT_BUILD_ESGF "Alias for CDAT_BUILD_LEAN" OFF)
286286
option(CDAT_BUILD_UVCMETRICSPKG "Builds uvcmetrics package " ON)
287+
option(CDAT_BUILD_PARAVIEW "Build ParaView rather than just VTK" OFF)
287288

288289
# If ESGF option is on then our build mode is LEAN.
289290
if (CDAT_BUILD_ESGF)
@@ -498,7 +499,7 @@ include(osmesa_pkg)
498499
include(python_pkg)
499500
include(seawater_pkg)
500501
include(vacumm_pkg)
501-
if (CDAT_BUILD_PARALLEL)
502+
if (CDAT_BUILD_PARAVIEW)
502503
include(paraview_pkg)
503504
else()
504505
include(vtk_pkg)

0 commit comments

Comments
 (0)