Added CI jobs for C++11 and C++14

ethz-asl · Dec 21, 2023 · 3b28d15 · 3b28d15
1 parent 20782d3
commit 3b28d15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/cpp_ubuntu20_04.yml b/.github/workflows/cpp_ubuntu20_04.yml
@@ -12,6 +12,7 @@ jobs:
       matrix:
         rosdistro: ['noetic']
         gcc: ['8', '9', '10']
+        cxx: ['11', '14', '17']
     container: ros:${{ matrix.rosdistro }}-ros-base-focal
     name: ROS ${{ matrix.rosdistro }} - GCC ${{ matrix.gcc }}
     steps:
@@ -35,7 +36,7 @@ jobs:
       run: sudo apt install -y libgoogle-glog-dev
 
     - name: Build lpp
-      run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && catkin build lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash
+      run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && catkin build -DCMAKE_CXX_STANDARD=${{ matrix.cxx }} lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash
       working-directory: catkin_ws
       shell: bash
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
 endif ()
 
 # Set standard of top level project or C++17
-if (NOT DEFINED ${CMAKE_CXX_STANDARD})
+if (NOT DEFINED CMAKE_CXX_STANDARD)
         set(CMAKE_CXX_STANDARD 17)
 else ()
         set(CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD})