Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-08 11:29:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Change VTKm_BUILD_RENDERING to VTKm_ENABLE_RENDERING

Browse Source 
This makes the name more consistent with the names of the other VTK-m
CMake options.

Also changed the default to be ON. I do not see a big downside to
compiling the rendering library most of the time.
This commit is contained in:
Kenneth Moreland 2016-09-15 09:27:48 -06:00
parent fa3c2b8986
commit c1de0e0746
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/VTKmConfig.cmake.in
View File

@ -64,8 +64,8 @@ set(VTKm_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
set(VTKm_ENABLE_CUDA "@VTKm_ENABLE_CUDA@") set(VTKm_ENABLE_CUDA "@VTKm_ENABLE_CUDA@")
set(VTKm_ENABLE_TBB "@VTKm_ENABLE_TBB@") set(VTKm_ENABLE_TBB "@VTKm_ENABLE_TBB@")
set(VTKm_ENABLE_OPENGL_INTEROP "@VTKm_ENABLE_OPENGL_INTEROP@") set(VTKm_ENABLE_OPENGL_INTEROP "@VTKm_ENABLE_OPENGL_INTEROP@")
set(VTKm_BUILD_RENDERING "@VTKm_BUILD_RENDERING@")
set(VTKm_ENABLE_OSMESA "@VTKm_ENABLE_OSMESA@") set(VTKm_ENABLE_OSMESA "@VTKm_ENABLE_OSMESA@")
set(VTKm_ENABLE_RENDERING "@VTKm_ENABLE_RENDERING@")
# Load the library exports, but only if not compiling VTK-m itself # Load the library exports, but only if not compiling VTK-m itself
set_and_check(VTKm_CONFIG_DIR "@PACKAGE_VTKm_INSTALL_CONFIG_DIR@") set_and_check(VTKm_CONFIG_DIR "@PACKAGE_VTKm_INSTALL_CONFIG_DIR@")

4
CMake/VTKmConfigureComponents.cmake
View File

@ -209,14 +209,14 @@ macro(vtkm_configure_component_Interop)
endmacro(vtkm_configure_component_Interop) endmacro(vtkm_configure_component_Interop)
macro(vtkm_configure_component_Rendering) macro(vtkm_configure_component_Rendering)
if(VTKm_BUILD_RENDERING) if(VTKm_ENABLE_RENDERING)
vtkm_configure_component_OpenGL() vtkm_configure_component_OpenGL()
vtkm_configure_component_EGL() vtkm_configure_component_EGL()
vtkm_configure_component_OSMesa() vtkm_configure_component_OSMesa()
endif() endif()
vtkm_finish_configure_component(Rendering vtkm_finish_configure_component(Rendering
DEPENDENT_VARIABLES VTKm_BUILD_RENDERING VTKm_Base_FOUND DEPENDENT_VARIABLES VTKm_ENABLE_RENDERING VTKm_Base_FOUND
ADD_LIBRARIES vtkm_rendering ADD_LIBRARIES vtkm_rendering
) )
endmacro(vtkm_configure_component_Rendering) endmacro(vtkm_configure_component_Rendering)

2
CMakeLists.txt
View File

@ -103,13 +103,13 @@ include(CMake/VTKmCompilerExtras.cmake)
# Configurable Options # Configurable Options
option(VTKm_ENABLE_CUDA "Enable Cuda support" OFF) option(VTKm_ENABLE_CUDA "Enable Cuda support" OFF)
option(VTKm_ENABLE_TBB "Enable TBB support" OFF) option(VTKm_ENABLE_TBB "Enable TBB support" OFF)
option(VTKm_ENABLE_RENDERING "Enable rendering library" ON)
option(VTKm_ENABLE_TESTING "Enable VTKm Testing" ON) option(VTKm_ENABLE_TESTING "Enable VTKm Testing" ON)
option(VTKm_ENABLE_BENCHMARKS "Enable VTKm Benchmarking" OFF) option(VTKm_ENABLE_BENCHMARKS "Enable VTKm Benchmarking" OFF)
option(VTKm_ENABLE_OSMESA "Enable creating the OSMesa canvas" OFF) option(VTKm_ENABLE_OSMESA "Enable creating the OSMesa canvas" OFF)
option(VTKm_BUILD_DOCUMENTATION "Build Doxygen documentation" OFF) option(VTKm_BUILD_DOCUMENTATION "Build Doxygen documentation" OFF)
option(VTKm_BUILD_EXAMPLES "Build examples" OFF) option(VTKm_BUILD_EXAMPLES "Build examples" OFF)
option(VTKm_BUILD_RENDERING "Build rendering" OFF)
option(VTKm_USE_DOUBLE_PRECISION option(VTKm_USE_DOUBLE_PRECISION
"Use double precision for floating point calculations" "Use double precision for floating point calculations"

4
examples/CMakeLists.txt
View File

@ -31,7 +31,7 @@ add_subdirectory(isosurface)
add_subdirectory(multi_backend) add_subdirectory(multi_backend)
add_subdirectory(streamline) add_subdirectory(streamline)
add_subdirectory(tetrahedra) add_subdirectory(tetrahedra)
if(VTKm_BUILD_RENDERING) if(VTKm_ENABLE_RENDERING)
add_subdirectory(rendering) add_subdirectory(rendering)
endif(VTKm_BUILD_RENDERING) endif()

4
vtkm/CMakeLists.txt
View File

@ -60,9 +60,9 @@ endif(VTKm_ENABLE_OPENGL_INTEROP)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build rendering # Build rendering
if(VTKm_BUILD_RENDERING) if(VTKm_ENABLE_RENDERING)
add_subdirectory(rendering) add_subdirectory(rendering)
endif(VTKm_BUILD_RENDERING) endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#add the control and exec folders #add the control and exec folders