Skip to content

Commit

Permalink
Merge pull request #987 from UV-CDAT/vtkweb-option
Browse files Browse the repository at this point in the history
Create an option to enable vtkweb
  • Loading branch information
aashish24 committed Feb 2, 2015
2 parents ae90d4a + f0714ee commit 3bf31ca
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CMake/cdat_modules/vtk_external.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ if(CDAT_BUILD_OFFSCREEN)
)
endif()

if(CDAT_BUILD_WEB)
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")
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,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_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")
set_property(CACHE EGG_INSTALLER PROPERTY STRINGS "PIP" "EASY_INSTALL")
Expand Down

0 comments on commit 3bf31ca

Please sign in to comment.