From 3d982c0580a8a6bbd03eefeb64bc254031df1aff Mon Sep 17 00:00:00 2001 From: Jonathan Beezley Date: Thu, 4 Dec 2014 15:04:22 -0500 Subject: [PATCH 1/2] Created an option to enable vtkweb --- CMake/cdat_modules/vtk_external.cmake | 6 ++++++ CMakeLists.txt | 3 +++ 2 files changed, 9 insertions(+) diff --git a/CMake/cdat_modules/vtk_external.cmake b/CMake/cdat_modules/vtk_external.cmake index 98bebcb7cb..3956b8783d 100644 --- a/CMake/cdat_modules/vtk_external.cmake +++ b/CMake/cdat_modules/vtk_external.cmake @@ -73,6 +73,12 @@ if(CDAT_BUILD_OFFSCREEN) ) endif() +if(CDAT_BUILD_VTKWEB) + list(APPEND vtk_build_args + "-DVTK_Group_Web:BOOL=ON" + ) +endif() + set(_vtk_module_options) foreach(_module ${_vtk_modules}) list(APPEND _vtk_module_options "-DModule_${_module}:BOOL=ON") diff --git a/CMakeLists.txt b/CMakeLists.txt index c1f39572be..6bd7ee7c47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,6 +251,9 @@ include(CMakeDependentOption) cmake_dependent_option(CDAT_BUILD_OFFSCREEN "Use OSMesa for offscreen rendering." OFF "NOT APPLE" OFF) +# Option to enable vtkweb for cdatweb +option(CDAT_BUILD_VTKWEB "Build VTKWeb with VTK" OFF) + # Option to choose between easy_install and pip (crunchy ssl/man in the middle prevents us to use pip here... set(EGG_INSTALLER "PIP" CACHE STRING "Which package installer to use") set_property(CACHE EGG_INSTALLER PROPERTY STRINGS "PIP" "EASY_INSTALL") From f0714eea0e8da85088ecfa10650c627794f2ec9d Mon Sep 17 00:00:00 2001 From: Jonathan Beezley Date: Fri, 30 Jan 2015 13:56:11 -0500 Subject: [PATCH 2/2] CDAT_BUILD_VTKWEB -> CDAT_BUILD_WEB --- CMake/cdat_modules/vtk_external.cmake | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/cdat_modules/vtk_external.cmake b/CMake/cdat_modules/vtk_external.cmake index 3956b8783d..f9fde04c59 100644 --- a/CMake/cdat_modules/vtk_external.cmake +++ b/CMake/cdat_modules/vtk_external.cmake @@ -73,7 +73,7 @@ if(CDAT_BUILD_OFFSCREEN) ) endif() -if(CDAT_BUILD_VTKWEB) +if(CDAT_BUILD_WEB) list(APPEND vtk_build_args "-DVTK_Group_Web:BOOL=ON" ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bd7ee7c47..2c96be745f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ cmake_dependent_option(CDAT_BUILD_OFFSCREEN "Use OSMesa for offscreen rendering. "NOT APPLE" OFF) # Option to enable vtkweb for cdatweb -option(CDAT_BUILD_VTKWEB "Build VTKWeb with VTK" OFF) +option(CDAT_BUILD_WEB "Build in Web support (VTKWeb, etc.)" OFF) # Option to choose between easy_install and pip (crunchy ssl/man in the middle prevents us to use pip here... set(EGG_INSTALLER "PIP" CACHE STRING "Which package installer to use")