From 06baa00d6f18fc5bb4c0e6992130a8e83463e0cc Mon Sep 17 00:00:00 2001 From: Michael Ripperger Date: Mon, 9 Nov 2020 18:19:03 -0600 Subject: [PATCH] ROS Noetic CI (#12) * Added CI build for ROS Noetic * Compile with c++14 --- .github/workflows/main.yml | 10 ++++++++-- CMakeLists.txt | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bad382e..0a64444 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,18 +14,24 @@ jobs: fail-fast: false matrix: env: - - {CI_NAME: Xenial-Build, + - {CI_NAME: xenial, OS_NAME: ubuntu, OS_CODE_NAME: xenial, ROS_DISTRO: kinetic, ROS_REPO: main, DOCKER_IMAGE: "ros:kinetic"} - - {CI_NAME: Bionic-Build, + - {CI_NAME: bionic, OS_NAME: ubuntu, OS_CODE_NAME: bionic, ROS_DISTRO: melodic, ROS_REPO: main, DOCKER_IMAGE: "ros:melodic"} + - {CI_NAME: focal, + OS_NAME: ubuntu, + OS_CODE_NAME: focal, + ROS_DISTRO: noetic, + ROS_REPO: main, + DOCKER_IMAGE: "ros:noetic"} runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/CMakeLists.txt b/CMakeLists.txt index f52c346..558def9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 2.8.3) project(rviz_tool_cursor) -add_compile_options(-std=c++11) +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) find_package(catkin REQUIRED COMPONENTS rviz