From 064068d0836309d0e19968cb35a4648e1d677486 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Tue, 10 Dec 2024 11:44:34 +0900 Subject: [PATCH] CMakeLists.txt: check both kinetic and indigo --- jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt | 2 +- jsk_rviz_plugins/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt b/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt index f9cbe248..7f25f4c8 100644 --- a/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt +++ b/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.3) project(jsk_interactive_marker) -if("$ENV{ROS_DISTRO}" STREQUAL "kinetic") +if(("$ENV{ROS_DISTRO}" STREQUAL "kinetic") OR ("$ENV{ROS_DISTRO}" STREQUAL "indigo")) # catch special case ROS kinetic where c++11 is not the default yet add_compile_options(-std=c++11) endif() diff --git a/jsk_rviz_plugins/CMakeLists.txt b/jsk_rviz_plugins/CMakeLists.txt index c14b0214..b9f14dc3 100644 --- a/jsk_rviz_plugins/CMakeLists.txt +++ b/jsk_rviz_plugins/CMakeLists.txt @@ -4,7 +4,7 @@ # http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html cmake_minimum_required(VERSION 2.8.3) project(jsk_rviz_plugins) -if("$ENV{ROS_DISTRO}" STREQUAL "kinetic") +if(("$ENV{ROS_DISTRO}" STREQUAL "kinetic") OR ("$ENV{ROS_DISTRO}" STREQUAL "indigo")) # catch special case ROS kinetic where c++11 is not the default yet add_compile_options(-std=c++11) endif()