Skip to content

Create an option to enable vtkweb #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aashish24 merged 2 commits into from
Feb 2, 2015
Merged

Create an option to enable vtkweb #987

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d982c0
Created an option to enable vtkweb
jbeezley Dec 4, 2014
f0714ee
CDAT_BUILD_VTKWEB -> CDAT_BUILD_WEB
jbeezley Jan 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMake/cdat_modules/vtk_external.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ if(CDAT_BUILD_OFFSCREEN)
)
endif()

if(CDAT_BUILD_VTKWEB)
Copy link
Copy Markdown
Contributor

@aashish24 aashish24 Jan 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about CDAT_ENABLE_WEB? Or CDAT_BUILD_WEB?

Copy link
Copy Markdown
Contributor Author

@jbeezley jbeezley Jan 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CDAT_BUILD_* is consistent with the other options. To me, VTKWEB is more explicit unless there is something else that WEB will enable, but I don't have a strong opinion.

Copy link
Copy Markdown
Contributor

@doutriaux1 doutriaux1 Jan 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like that: CDAT_BUILD_VTKWEB

Copy link
Copy Markdown
Contributor

@aashish24 aashish24 Jan 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@doutriaux1 we don't want to expose vtkweb. Web option in the future will enable more than just 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")
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
⚡