fix cmake

alexgiving · Aug 13, 2022 · 8a3cab6 · 8a3cab6
1 parent 071232c
commit 8a3cab6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -10,9 +10,8 @@ jobs:
   Basic_Workflow:
     strategy:
       matrix:
-        version: [11, 14, 17, 20]
+        version: [11, 14, 17, 20, 23]
         os: [
-            ubuntu-18.04,
             ubuntu-20.04,
             ubuntu-22.04,
           ]
@@ -23,7 +22,6 @@ jobs:
 
       - name: Build Stage
         run: |
-          echo ${{ matrix.os }}
           mkdir build && cd build
           cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} ..
           make -j

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,8 +17,7 @@ option(BUILD_ADE_TUTORIAL      "Build tutorial samples"           OFF)
 option(FORCE_ADE_ASSERTS       "Always enable ADE_ASSERT"         OFF)
 option(BUILD_ADE_DOCUMENTATION "Build doxygen documentation"      OFF)
 
-set(ADE_CXX_STANDARD 11 CACHE STRING "C++ standard")
-set(CMAKE_CXX_STANDARD ${ADE_CXX_STANDARD})
+set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard")
 
 # TODO: this is horrible hack, we must follow cmake
 # build/install policy
@@ -47,8 +46,6 @@ function(add_security_flags target)
     endif()
 endfunction()
 
-# set(CMAKE_CXX_STANDARD 11)
-
 if (MSVC)
     add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 endif(MSVC)