From a446afbaf9f066f688d4c9e9ee48e0c720b82902 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Mon, 4 May 2015 10:45:34 -0700 Subject: [PATCH 1/2] added option to turn paraview build on/off --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae6547597d..a87351bdba 100644 --- 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) From 1c6cae7016985f1fef5c49a11e4bd080aafdc32a Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Mon, 4 May 2015 11:20:17 -0700 Subject: [PATCH 2/2] cdat paraview deps flag correct now --- CMake/cdat_modules/cdat_deps.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cdat_modules/cdat_deps.cmake b/CMake/cdat_modules/cdat_deps.cmake index d9fd52b7e4..70d44f426f 100644 --- 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})