From 071232c9fcd41c6e86d19ad0adaac9509883f6bb Mon Sep 17 00:00:00 2001 From: alexgiving Date: Sat, 13 Aug 2022 11:55:36 +0300 Subject: [PATCH] test c++ standarts --- .github/workflows/workflow.yaml | 4 +++- CMakeLists.txt | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 5769162..279362b 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -10,6 +10,7 @@ jobs: Basic_Workflow: strategy: matrix: + version: [11, 14, 17, 20] os: [ ubuntu-18.04, ubuntu-20.04, @@ -22,8 +23,9 @@ jobs: - name: Build Stage run: | + echo ${{ matrix.os }} mkdir build && cd build - cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release .. + cmake -DENABLE_ADE_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=${{ matrix.version }} .. make -j - name: ADE-Test Stage diff --git a/CMakeLists.txt b/CMakeLists.txt index c428db2..266e839 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,9 @@ 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}) + # TODO: this is horrible hack, we must follow cmake # build/install policy set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) @@ -44,7 +47,7 @@ function(add_security_flags target) endif() endfunction() -set(CMAKE_CXX_STANDARD 11) +# set(CMAKE_CXX_STANDARD 11) if (MSVC) add_definitions(-D_SCL_SECURE_NO_WARNINGS)