. e Fix setting of CMake standard - in CI and debug

approvals · Nov 21, 2023 · c9f24de · c9f24de
1 parent 9e7bbab
commit c9f24de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/github_actions_build.yml b/.github/workflows/github_actions_build.yml
@@ -76,7 +76,7 @@ jobs:
             os-version: '22.04'
             c-compiler: 'clang-13'
             cxx-compiler: 'clang++-13'
-            generator: '"Unix Makefiles" -DCXX_STANDARD=20'
+            generator: '"Unix Makefiles" -DCMAKE_CXX_STANDARD=20'
             relative_build_dir_path: ''
 
           - job-name: 'clang14'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,9 +72,9 @@ message("CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER}")
 message("CMAKE_CXX_COMPILER_ID = ${CMAKE_CXX_COMPILER_ID}")
 message("CMAKE_CXX_COMPILER_VERSION = ${CMAKE_CXX_COMPILER_VERSION}")
 message("CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
-message("CXX_STANDARD = ${CXX_STANDARD}")
-message("CXX_STANDARD_REQUIRED = ${CXX_STANDARD_REQUIRED}")
-message("CXX_EXTENSIONS = ${CXX_EXTENSIONS}")
+message("CMAKE_CXX_STANDARD = ${CMAKE_CXX_STANDARD}")
+message("CMAKE_CXX_STANDARD_REQUIRED = ${CMAKE_CXX_STANDARD_REQUIRED}")
+message("CMAKE_CXX_EXTENSIONS = ${CMAKE_CXX_EXTENSIONS}")
 #message("CMAKE_UNITY_BUILD = ${CMAKE_UNITY_BUILD}")
 #message("NOT_SUBPROJECT = ${NOT_SUBPROJECT}")
 #message("APPROVAL_TESTS_BUILD_THIRD_PARTY_CATCH2 = ${APPROVAL_TESTS_BUILD_THIRD_PARTY_CATCH2}")