diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-24 14:56:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-04-24 20:46:11 (GMT) |
| commit | c722bde0e33e64976a2202dd508cdeb9c7801ce7 (patch) | |
| tree | 39f9b5d0a1fc1fe5e18d837bfa540431aa62816f | |
| parent | b84b0fdd89d9eef543503f8ca6d09a5bb4d162c6 (diff) | |
| download | CMake-c722bde0e33e64976a2202dd508cdeb9c7801ce7.zip CMake-c722bde0e33e64976a2202dd508cdeb9c7801ce7.tar.gz CMake-c722bde0e33e64976a2202dd508cdeb9c7801ce7.tar.bz2 | |
ci: Enable FindOpenACC test for each language independently
| -rw-r--r-- | .gitlab/ci/configure_debian12_aarch64_ninja.cmake | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_debian12_ninja_common.cmake | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora40_makefiles.cmake | 3 | ||||
| -rw-r--r-- | Tests/FindOpenACC/CMakeLists.txt | 10 |
4 files changed, 11 insertions, 8 deletions
diff --git a/.gitlab/ci/configure_debian12_aarch64_ninja.cmake b/.gitlab/ci/configure_debian12_aarch64_ninja.cmake index 0e2c991..24be975 100644 --- a/.gitlab/ci/configure_debian12_aarch64_ninja.cmake +++ b/.gitlab/ci/configure_debian12_aarch64_ninja.cmake @@ -64,6 +64,9 @@ set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "") set(CMake_TEST_FindMPI "ON" CACHE BOOL "") set(CMake_TEST_FindODBC "ON" CACHE BOOL "") set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_Fortran "ON" CACHE BOOL "") set(CMake_TEST_FindOpenAL "ON" CACHE BOOL "") set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_debian12_ninja_common.cmake b/.gitlab/ci/configure_debian12_ninja_common.cmake index b3a97f6..98ae771 100644 --- a/.gitlab/ci/configure_debian12_ninja_common.cmake +++ b/.gitlab/ci/configure_debian12_ninja_common.cmake @@ -69,6 +69,9 @@ set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "") set(CMake_TEST_FindMPI "ON" CACHE BOOL "") set(CMake_TEST_FindODBC "ON" CACHE BOOL "") set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_Fortran "ON" CACHE BOOL "") set(CMake_TEST_FindOpenAL "ON" CACHE BOOL "") set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora40_makefiles.cmake b/.gitlab/ci/configure_fedora40_makefiles.cmake index 90d8343..8b2373c 100644 --- a/.gitlab/ci/configure_fedora40_makefiles.cmake +++ b/.gitlab/ci/configure_fedora40_makefiles.cmake @@ -67,6 +67,9 @@ set(CMake_TEST_FindMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LI set(CMake_TEST_FindMPI "ON" CACHE BOOL "") set(CMake_TEST_FindODBC "ON" CACHE BOOL "") set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenACC_Fortran "ON" CACHE BOOL "") set(CMake_TEST_FindOpenAL "ON" CACHE BOOL "") set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") diff --git a/Tests/FindOpenACC/CMakeLists.txt b/Tests/FindOpenACC/CMakeLists.txt index ef7de65..1b6bcf2 100644 --- a/Tests/FindOpenACC/CMakeLists.txt +++ b/Tests/FindOpenACC/CMakeLists.txt @@ -1,11 +1,5 @@ - -set(langs C CXX) -if(NOT CMAKE_GENERATOR STREQUAL "Ninja") - list(APPEND langs Fortran) -endif() - -foreach(lang IN LISTS langs) - if(CMAKE_${lang}_COMPILER) +foreach(lang IN ITEMS C CXX Fortran) + if(CMake_TEST_FindOpenACC_${lang}) add_test(NAME FindOpenACC.Test${lang} COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> --build-and-test |