From acf1179e74ff79b1ca415224cbaa114de30780f7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 23 Apr 2024 14:28:43 -0400 Subject: ci: Verify that C++26 modes work with GCC and Clang on Fedora --- .gitlab/ci/configure_fedora40_common_clang.cmake | 3 +++ .gitlab/ci/configure_fedora40_makefiles.cmake | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/configure_fedora40_common_clang.cmake b/.gitlab/ci/configure_fedora40_common_clang.cmake index 9fdc6bc..a4ae3f3 100644 --- a/.gitlab/ci/configure_fedora40_common_clang.cmake +++ b/.gitlab/ci/configure_fedora40_common_clang.cmake @@ -2,6 +2,9 @@ set(CMAKE_Fortran_COMPILER "/usr/bin/flang-new" CACHE FILEPATH "") set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "") set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") +set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") +set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") + set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "") set(CMake_TEST_FindOpenACC_C "ON" CACHE BOOL "") set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora40_makefiles.cmake b/.gitlab/ci/configure_fedora40_makefiles.cmake index 8b2373c..478ba11 100644 --- a/.gitlab/ci/configure_fedora40_makefiles.cmake +++ b/.gitlab/ci/configure_fedora40_makefiles.cmake @@ -1,5 +1,5 @@ set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") -set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23" CACHE STRING "") +set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") set(CMake_TEST_CTestUpdate_BZR "ON" CACHE BOOL "") set(CMake_TEST_CTestUpdate_GIT "ON" CACHE BOOL "") -- cgit v0.12