Skip to content

Commit c4bff52

Browse files
committed
Adding GCC15 to CI, take 3
1 parent a5cd7bf commit c4bff52

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,15 @@ add_library(${LIBNAME}::${LIBNAME} ALIAS ${LIBNAME})
5151
set(ISPTR_MODULES_BASE_DIRS ${SRCDIR}/modules)
5252
set(ISPTR_MODULES_FILES ${SRCDIR}/modules/isptr.cppm)
5353

54+
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28")
55+
5456
function(isptr_add_module target_name visibility)
5557
target_sources(${target_name} ${visibility}
5658
FILE_SET isptr_module TYPE CXX_MODULES BASE_DIRS ${ISPTR_MODULES_BASE_DIRS} FILES ${ISPTR_MODULES_FILES}
5759
)
5860
endfunction()
5961

62+
endif()
6063

6164
if (PROJECT_IS_TOP_LEVEL)
6265

test/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ set(CXX_STANDARD_20 20)
3131
set(CXX_STANDARD_23 23)
3232

3333
set(TEST_VARIANTS_17 "headers")
34+
set(TEST_VARIANTS_20 "headers")
35+
set(TEST_VARIANTS_23 "headers")
36+
3437
if (${ISPTR_ENABLE_MODULE})
35-
set(TEST_VARIANTS_20 "headers;module")
36-
set(TEST_VARIANTS_23 "headers;module")
37-
else()
38-
set(TEST_VARIANTS_20 "headers")
39-
set(TEST_VARIANTS_23 "headers")
38+
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28")
39+
list(APPEND TEST_VARIANTS_20 "module")
40+
list(APPEND TEST_VARIANTS_23 "module")
41+
else()
42+
message(WARNING CMake version ${CMAKE_VERSION} doesn't support modules, ignoring ISPTR_ENABLE_MODULE)
43+
endif()
4044
endif()
4145

4246
set(TEST_COMMAND "")

0 commit comments

Comments
 (0)