[CI and CMake] fix cppversion

yanyiwu · Jul 27, 2024 · 4b68ac1 · 4b68ac1
1 parent ade0331
commit 4b68ac1
Show file tree

Hide file tree

Showing 2 changed files with 9 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: [98, 11, 14, 17, 20]
 
     steps:
     - uses: actions/checkout@v2

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 #