From 461616a771f7849a184be12008fda0f5aca4d176 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 16 Sep 2020 09:36:28 -0400 Subject: [PATCH] Refactor some VTK-m device adapter to be alphabetical --- CMake/VTKmConfig.cmake.in | 4 ++-- CMakeLists.txt | 4 ++-- vtkm/internal/CMakeLists.txt | 14 +++----------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/CMake/VTKmConfig.cmake.in b/CMake/VTKmConfig.cmake.in index 3097e7a1e..05b81592c 100644 --- a/CMake/VTKmConfig.cmake.in +++ b/CMake/VTKmConfig.cmake.in @@ -68,9 +68,9 @@ set(VTKm_VERSION "@VTKm_VERSION@") set(VTKm_BUILD_SHARED_LIBS "@VTKm_BUILD_SHARED_LIBS@") set(VTKm_ENABLE_CUDA "@VTKm_ENABLE_CUDA@") -set(VTKm_ENABLE_TBB "@VTKm_ENABLE_TBB@") -set(VTKm_ENABLE_OPENMP "@VTKm_ENABLE_OPENMP@") set(VTKm_ENABLE_KOKKOS "@VTKm_ENABLE_KOKKOS@") +set(VTKm_ENABLE_OPENMP "@VTKm_ENABLE_OPENMP@") +set(VTKm_ENABLE_TBB "@VTKm_ENABLE_TBB@") set(VTKm_ENABLE_LOGGING "@VTKm_ENABLE_LOGGING@") set(VTKm_ENABLE_RENDERING "@VTKm_ENABLE_RENDERING@") set(VTKm_ENABLE_GL_CONTEXT "@VTKm_ENABLE_GL_CONTEXT@") diff --git a/CMakeLists.txt b/CMakeLists.txt index e907495f3..8b12223d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,9 +73,9 @@ endmacro () # Configurable Options vtkm_option(VTKm_ENABLE_CUDA "Enable Cuda support" OFF) -vtkm_option(VTKm_ENABLE_TBB "Enable TBB support" OFF) -vtkm_option(VTKm_ENABLE_OPENMP "Enable OpenMP support" OFF) vtkm_option(VTKm_ENABLE_KOKKOS "Enable Kokkos support" OFF) +vtkm_option(VTKm_ENABLE_OPENMP "Enable OpenMP support" OFF) +vtkm_option(VTKm_ENABLE_TBB "Enable TBB support" OFF) vtkm_option(VTKm_ENABLE_RENDERING "Enable rendering library" ON) vtkm_option(VTKm_ENABLE_BENCHMARKS "Enable VTKm Benchmarking" OFF) vtkm_option(VTKm_ENABLE_MPI "Enable MPI support" OFF) diff --git a/vtkm/internal/CMakeLists.txt b/vtkm/internal/CMakeLists.txt index 2019eb291..4224aaa2c 100755 --- a/vtkm/internal/CMakeLists.txt +++ b/vtkm/internal/CMakeLists.txt @@ -19,9 +19,10 @@ 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_OPENMP ${VTKm_ENABLE_OPENMP}) set(VTKM_ENABLE_KOKKOS ${VTKm_ENABLE_KOKKOS}) +set(VTKM_ENABLE_OPENMP ${VTKm_ENABLE_OPENMP}) +set(VTKM_ENABLE_TBB ${VTKm_ENABLE_TBB}) + set(VTKM_ENABLE_MPI ${VTKm_ENABLE_MPI}) if(VTKM_ENABLE_CUDA) @@ -34,7 +35,6 @@ if (TARGET vtkm::kokkos_cuda) endif() set(VTKM_ENABLE_LOGGING ${VTKm_ENABLE_LOGGING}) - set(VTKM_NO_DEPRECATED_VIRTUAL ${VTKm_NO_DEPRECATED_VIRTUAL}) vtkm_get_kit_name(kit_name kit_dir) @@ -45,14 +45,6 @@ vtkm_install_headers(vtkm/internal ${VTKm_BINARY_INCLUDE_DIR}/${kit_dir}/Configure.h ) -unset(VTKM_ENABLE_MPI) -unset(VTKM_ENABLE_TBB) -unset(VTKM_ENABLE_CUDA) - -unset(VTKM_USE_64BIT_IDS) -unset(VTKM_USE_DOUBLE_PRECISION) -unset(VTKM_NO_ASSERT) - set(headers ArrayPortalBasic.h