Skip to content

Commit 73880e9

Browse files
authored
Don't set C++ standard version in the CMake (#170)
Doing so violates the [CMAKE.PASSIVE_PROJECT] requirement of the Beman Standard: https://github.com/bemanproject/beman/blob/main/docs/BEMAN_STANDARD.md#cmakepassive_projects Due to this setting, all the CI jobs were running with C++26 set, making the C++20 jobs spuriously pass. This commit removes them. It also changes the C++ standard version used by the presets from C++20 to C++23.
1 parent 196e80d commit 73880e9

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

.github/workflows/ci_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
}
4747
]
4848
},
49-
{ "cxxversions": ["c++23", "c++20"],
49+
{ "cxxversions": ["c++23"],
5050
"tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
5151
}
5252
]
5353
},
5454
{ "versions": ["14", "13"],
5555
"tests": [
56-
{ "cxxversions": ["c++26", "c++23", "c++20"],
56+
{ "cxxversions": ["c++26", "c++23"],
5757
"tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
5858
}
5959
]
@@ -72,7 +72,7 @@ jobs:
7272
}
7373
]
7474
},
75-
{ "cxxversions": ["c++23", "c++20"],
75+
{ "cxxversions": ["c++23"],
7676
"tests": [
7777
{"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
7878
]
@@ -81,7 +81,7 @@ jobs:
8181
},
8282
{ "versions": ["19"],
8383
"tests": [
84-
{ "cxxversions": ["c++26", "c++23", "c++20"],
84+
{ "cxxversions": ["c++26", "c++23"],
8585
"tests": [
8686
{"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
8787
]
@@ -90,7 +90,7 @@ jobs:
9090
},
9191
{ "versions": ["18", "17"],
9292
"tests": [
93-
{ "cxxversions": ["c++26", "c++23", "c++20"],
93+
{ "cxxversions": ["c++26", "c++23"],
9494
"tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]
9595
}
9696
]

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"generator": "Ninja",
88
"binaryDir": "${sourceDir}/build/${presetName}",
99
"cacheVariables": {
10-
"CMAKE_CXX_STANDARD": "20",
10+
"CMAKE_CXX_STANDARD": "23",
1111
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
1212
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "./infra/cmake/use-fetch-content.cmake"
1313
}

src/beman/execution/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,6 @@ source_group("Header Files\\detail" FILES ${DETAIL_HEADER_FILES})
210210

211211
set_target_properties(${TARGET_NAME} PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON)
212212

213-
target_compile_features(${TARGET_NAME} PUBLIC
214-
"$<$<COMPILE_FEATURES:cxx_std_26>:cxx_std_26>"
215-
"$<$<NOT:$<COMPILE_FEATURES:cxx_std_26>>:cxx_std_23>"
216-
)
217-
218213
if(NOT BEMAN_EXECUTION_ENABLE_INSTALL OR CMAKE_SKIP_INSTALL_RULES)
219214
return()
220215
endif()

0 commit comments

Comments
 (0)