diff options
| author | Brad King <brad.king@kitware.com> | 2024-09-30 13:56:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-09-30 13:56:45 (GMT) |
| commit | 80d16018fa909ff5713f292fc8baba7510c2a3ee (patch) | |
| tree | 46b62fe3f543dce690c4c15bab7efce376faef9a /Tests | |
| parent | f63823ed15827a24923d8ca04bc3d25214de4ad7 (diff) | |
| parent | 8f4cea94da32a2eb3c4603ce7af166eff50982fa (diff) | |
| download | CMake-80d16018fa909ff5713f292fc8baba7510c2a3ee.zip CMake-80d16018fa909ff5713f292fc8baba7510c2a3ee.tar.gz CMake-80d16018fa909ff5713f292fc8baba7510c2a3ee.tar.bz2 | |
Merge topic 'FindOpenMP-CUDA'
8f4cea94da FindOpenMP: Add support for CUDA when supported by the toolchain
f8ed4d7c21 FindOpenMP: Factor out compiler id lookup
534923428a FindOpenMP: Simplify compiler driver check
42bf0f596e FindOpenMP: Simplify explicit "omp" library checks
5204262c0e ci: add libomp to cuda12.2 base image
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9861
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/FindOpenMP/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/FindOpenMP/Test/CMakeLists.txt | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/Tests/FindOpenMP/CMakeLists.txt b/Tests/FindOpenMP/CMakeLists.txt index ea90baa..c8d684a 100644 --- a/Tests/FindOpenMP/CMakeLists.txt +++ b/Tests/FindOpenMP/CMakeLists.txt @@ -1,4 +1,4 @@ -foreach(c C CXX Fortran) +foreach(c C CXX CUDA Fortran) if(CMake_TEST_FindOpenMP_${c}) set(CMake_TEST_FindOpenMP_FLAG_${c} 1) else() @@ -16,9 +16,13 @@ add_test(NAME FindOpenMP.Test COMMAND --build-options ${build_options} -DOpenMP_TEST_C=${CMake_TEST_FindOpenMP_FLAG_C} -DOpenMP_TEST_CXX=${CMake_TEST_FindOpenMP_FLAG_CXX} + -DOpenMP_TEST_CUDA=${CMake_TEST_FindOpenMP_FLAG_CUDA} -DOpenMP_TEST_Fortran=${CMake_TEST_FindOpenMP_FLAG_Fortran} --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> ) +if(CMake_TEST_FindOpenMP_FLAG_CUDA) + set_property(TEST FindOpenMP.Test APPEND PROPERTY LABELS "CUDA") +endif() if(CMake_TEST_FindOpenMP_FLAG_Fortran) set_property(TEST FindOpenMP.Test APPEND PROPERTY LABELS "Fortran") endif() diff --git a/Tests/FindOpenMP/Test/CMakeLists.txt b/Tests/FindOpenMP/Test/CMakeLists.txt index 4083855..7b05372 100644 --- a/Tests/FindOpenMP/Test/CMakeLists.txt +++ b/Tests/FindOpenMP/Test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.30) project(TestFindOpenMP NONE) include(CTest) @@ -8,6 +8,9 @@ macro(source_code_mapper_helper LANG_NAME SRC_FILE_NAME) elseif("${LANG_NAME}" STREQUAL "CXX") configure_file("${SRC_FILE_NAME}.c" "${SRC_FILE_NAME}.cxx" COPYONLY) set(OpenMPTEST_SOURCE_FILE "${SRC_FILE_NAME}.cxx") + elseif("${LANG_NAME}" STREQUAL "CUDA") + configure_file("${SRC_FILE_NAME}.c" "${SRC_FILE_NAME}.cu" COPYONLY) + set(OpenMPTEST_SOURCE_FILE "${SRC_FILE_NAME}.cu") elseif("${LANG_NAME}" STREQUAL "Fortran") set(OpenMPTEST_SOURCE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SRC_FILE_NAME}.f90") if(OpenMP_Fortran_HAVE_OMPLIB_MODULE) @@ -19,7 +22,7 @@ macro(source_code_mapper_helper LANG_NAME SRC_FILE_NAME) endif() endmacro() -foreach(c C CXX Fortran) +foreach(c C CXX CUDA Fortran) if("${OpenMP_TEST_${c}}") message("Testing ${c}") enable_language(${c}) @@ -41,7 +44,7 @@ if(test_msvc_runtime) endif() endif() -foreach(c C CXX Fortran) +foreach(c C CXX CUDA Fortran) if(NOT "${OpenMP_TEST_${c}}") continue() endif() @@ -65,11 +68,11 @@ foreach(c C CXX Fortran) set_property(TARGET scalprod_${c} PROPERTY LINKER_LANGUAGE ${c}) endforeach() -foreach(c C CXX Fortran) +foreach(c C CXX CUDA Fortran) if(NOT "${OpenMP_TEST_${c}}") continue() endif() - foreach(d C CXX Fortran) + foreach(d C CXX CUDA Fortran) if(NOT "${OpenMP_TEST_${d}}") continue() endif() |