From cf32b430dc6435975b587397da4d2e2a0f5be7af Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 16 Sep 2015 16:58:10 -0400 Subject: [PATCH] Teach Configure.h to store if TBB and CUDA are enabled. --- CMakeLists.txt | 8 ++++++++ vtkm/internal/Configure.h.in | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f819e410..14e6f46d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,6 +200,10 @@ endif(VTKm_BUILD_EXAMPLES) set(VTKM_USE_DOUBLE_PRECISION ${VTKm_USE_DOUBLE_PRECISION}) set(VTKM_USE_64BIT_IDS ${VTKm_USE_64BIT_IDS}) + +set(VTKM_ENABLE_CUDA ${VTKm_ENABLE_CUDA}) +set(VTKM_ENABLE_TBB ${VTKm_ENABLE_TBB}) + set(VTKM_ENABLE_OPENGL_INTEROP ${VTKm_ENABLE_OPENGL_INTEROP}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkm/internal/Configure.h.in @@ -209,6 +213,10 @@ vtkm_install_headers( vtkm/internal ${CMAKE_CURRENT_BINARY_DIR}/vtkm/internal/Configure.h) unset(VTKM_ENABLE_OPENGL_INTEROP) + +unset(VTKM_ENABLE_TBB) +unset(VTKM_ENABLE_CUDA) + unset(VTKM_USE_64BIT_IDS) unset(VTKM_USE_DOUBLE_PRECISION) diff --git a/vtkm/internal/Configure.h.in b/vtkm/internal/Configure.h.in index a28ff1f57..1d0d15dad 100644 --- a/vtkm/internal/Configure.h.in +++ b/vtkm/internal/Configure.h.in @@ -131,6 +131,15 @@ #define VTKM_THIRDPARTY_POST_INCLUDE #endif +//Mark if we are building with CUDA enabled +#ifndef VTKM_ENABLE_CUDA +#cmakedefine VTKM_ENABLE_CUDA +#endif +//Mark if we are building with TBB enabled +#ifndef VTKM_ENABLE_TBB +#cmakedefine VTKM_ENABLE_TBB +#endif + //Mark if we are building with interop enabled #ifndef VTKM_ENABLE_OPENGL_INTEROP #cmakedefine VTKM_ENABLE_OPENGL_INTEROP