[CMake] fix CMAKE_CXX_STANDARD passed from github/actions and only [c…

…++11, c++14]
yanyiwu · Jul 27, 2024 · 9721701 · 9721701
1 parent ade0331
commit 9721701
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]  
-        cpp_version: [c++03, c++11, c++14, c++17, c++20]
+        cpp_version: [11, 14]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Next Version
+
++ [CMake] fix CMAKE_CXX_STANDARD passed from github/actions and [c++11, c++14] only
+
 ## v0.7.0
 
 + [CI] Added os.macos and cpp_version=[c++98, c++03, c++11, c++14, c++17, c++20]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,9 +7,14 @@ PROJECT(limonp
 # cmake config #
 ################
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "C++ Standard Requirement")
-set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "C++ Extensions")
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 11)
+endif()
+message(STATUS "CMAKE_CXX_STANDARD is ${CMAKE_CXX_STANDARD}")
+
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 
 ##############
 # dependency #