Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'add-enable-testing-lib'

Browse Source 
b83b4f888 CMake: adds VTKm_ENABLE_TESTING_LIB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2586
This commit is contained in:
Vicente Bolea 2021-09-29 15:15:02 +00:00 committed by Kitware Robot
commit 7b737ed2d5
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -97,6 +97,11 @@ if (NOT DEFINED VTKm_ENABLE_TESTING)
endif()
endif()
# By default: VTKm_ENABLE_TESTING -> VTKm_ENABLE_TESTING_LIB
include(CMakeDependentOption)
cmake_dependent_option(VTKm_ENABLE_TESTING_LIBRARY "Enable VTKm Testing Library" OFF "NOT VTKm_ENABLE_TESTING" ON)
mark_as_advanced(VTKm_ENABLE_TESTING_LIB)
vtkm_option(VTKm_USE_DOUBLE_PRECISION "Use double precision for floating point calculations" OFF)
vtkm_option(VTKm_USE_64BIT_IDS "Use 64-bit indices." ON)

4
vtkm/cont/CMakeLists.txt
View File

@ -319,6 +319,6 @@ if(TARGET vtkm_loguru)
endif()
#-----------------------------------------------------------------------------
if (VTKm_ENABLE_TESTING)
if(VTKm_ENABLE_TESTING_LIBRARY)
add_subdirectory(testing)
endif ()
endif()

20
vtkm/cont/testing/CMakeLists.txt
View File

@ -112,13 +112,15 @@ vtkm_library(
)
target_link_libraries(vtkm_cont_testing PUBLIC vtkm_cont)
vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG)
if(VTKm_ENABLE_TESTING)
vtkm_unit_tests(SOURCES ${unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG)
# add distributed tests i.e. test to run with MPI
# if MPI is enabled.
set(mpi_unit_tests
UnitTestFieldRangeGlobalCompute.cxx
UnitTestSerializationArrayHandle.cxx
UnitTestSerializationDataSet.cxx
)
vtkm_unit_tests(MPI SOURCES ${mpi_unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG)
# add distributed tests i.e. test to run with MPI
# if MPI is enabled.
set(mpi_unit_tests
UnitTestFieldRangeGlobalCompute.cxx
UnitTestSerializationArrayHandle.cxx
UnitTestSerializationDataSet.cxx
)
vtkm_unit_tests(MPI SOURCES ${mpi_unit_tests} DEFINES VTKM_NO_ERROR_ON_MIXED_CUDA_CXX_TAG)
endif()