Skip to content

Commit 0896b18

Browse files
committed
We need at least cmake v3.28!
1 parent 1e3b907 commit 0896b18

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

.github/workflows/ci_tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup build environment
2828
uses: lukka/get-cmake@latest
2929
with:
30-
cmakeVersion: "~3.25.0"
30+
cmakeVersion: "~3.28.0"
3131
ninjaVersion: "^1.11.1"
3232
- name: Setup MSVC
3333
if: startsWith(matrix.presets.platform, 'windows')
@@ -80,7 +80,7 @@ jobs:
8080
- name: Install Ninja
8181
uses: lukka/get-cmake@latest
8282
with:
83-
cmakeVersion: "~3.25.0"
83+
cmakeVersion: "~4.0.0"
8484
ninjaVersion: "^1.11.1"
8585
- name: Setup MSVC
8686
if: startsWith(matrix.platform.os, 'windows')
@@ -139,7 +139,7 @@ jobs:
139139
- name: Setup build environment
140140
uses: lukka/get-cmake@latest
141141
with:
142-
cmakeVersion: "~3.25.0"
142+
cmakeVersion: "~3.28.0"
143143
ninjaVersion: "^1.11.1"
144144
- name: Print installed softwares
145145
run: |
@@ -166,10 +166,10 @@ jobs:
166166
matrix:
167167
compilers:
168168
- class: GNU
169-
version: 14
169+
version: 15
170170
toolchain: "cmake/gnu-toolchain.cmake"
171171
- class: GNU
172-
version: 13
172+
version: 14
173173
toolchain: "cmake/gnu-toolchain.cmake"
174174
- class: LLVM
175175
version: 20
@@ -183,7 +183,7 @@ jobs:
183183
- name: Setup build environment
184184
uses: lukka/get-cmake@latest
185185
with:
186-
cmakeVersion: "~3.25.0"
186+
cmakeVersion: "~4.0.0"
187187
ninjaVersion: "^1.11.1"
188188
- name: Install Compiler
189189
id: install-compiler

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(CMAKE_CXX_MODULE_STD)
88
set(CMAKE_CXX_STANDARD_REQUIRED OFF)
99
endif()
1010

11-
cmake_minimum_required(VERSION 3.25...4.0)
11+
cmake_minimum_required(VERSION 3.28...4.0)
1212

1313
project(
1414
beman.scope
@@ -41,7 +41,7 @@ option(
4141

4242
add_library(beman.scope)
4343
add_library(beman::scope ALIAS beman.scope)
44-
target_compile_features(beman.scope PRIVATE cxx_std_23)
44+
target_compile_features(beman.scope PRIVATE cxx_std_20)
4545

4646
# gersemi: off
4747

tests/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FetchContent_Declare(
77
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
88
GIT_TAG v3.8.0
99
SYSTEM
10-
# MABY: FIND_PACKAGE_ARGS 3.8.0
10+
# MAYBY: FIND_PACKAGE_ARGS 3.8.0
1111
)
1212
FetchContent_MakeAvailable(Catch2)
1313

@@ -19,11 +19,12 @@ include(Catch)
1919

2020
add_executable(test.module)
2121
target_sources(test.module PRIVATE module.test.cpp)
22-
target_compile_features(test.module PRIVATE cxx_std_23)
23-
add_test(NAME test.module COMMAND test.module)
22+
# MAYBE: target_compile_features(test.module PRIVATE cxx_std_23)
2423
target_link_libraries(test.module PRIVATE beman::scope)
2524

26-
# XXX target_compile_options(test.module PRIVATE "-fmodules")
25+
add_test(NAME test.module COMMAND test.module)
26+
27+
# XXX NO! target_compile_options(test.module PRIVATE "-fmodules")
2728
# target_link_libraries(
2829
# test.module
2930
# PUBLIC FILE_SET TYPE CXX_MODULES include/beman/scope/beman.scope.cppm

0 commit comments

Comments
 (0)