Skip to content

Commit

Permalink
drop ROS_DISTRO STRGREATER tests
Browse files Browse the repository at this point in the history
As the Debian packages use "Debian"
https://salsa.debian.org/science-team/ros-ros-environment/-/blame/master/debian/rules?ref_type=heads#L6
which is incompatible, does not trigger them

c++14 is the default from melodic onward, so the additional statements
there are not necessary
  • Loading branch information
v4hn committed Oct 10, 2024
1 parent c0f1654 commit 54b1406
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
cmake_minimum_required(VERSION 2.8.3)
project(jsk_interactive_marker)

if("$ENV{ROS_DISTRO}" STRGREATER "melodic")
add_compile_options(-std=c++14)
else()
if("$ENV{ROS_DISTRO}" STREQUAL "kinetic")
# catch special case ROS kinetic where c++11 is not the default yet
add_compile_options(-std=c++11)
endif()

Expand Down
2 changes: 1 addition & 1 deletion jsk_rqt_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ install(DIRECTORY launch resource sample sample_scripts test

if (CATKIN_ENABLE_TESTING)
find_package(rostest REQUIRED)
if("$ENV{ROS_DISTRO}" STRGREATER "indigo")
if(NOT "$ENV{ROS_DISTRO}" STREQUAL "indigo")
catkin_add_nosetests(test)
add_rostest(test/test_rqt_plugins.test)
endif()
Expand Down
5 changes: 2 additions & 3 deletions jsk_rviz_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
# 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}" STRGREATER "melodic")
add_compile_options(-std=c++14)
else()
if("$ENV{ROS_DISTRO}" STREQUAL "kinetic")
# catch special case ROS kinetic where c++11 is not the default yet
add_compile_options(-std=c++11)
endif()
# Load catkin and all dependencies required for this package
Expand Down

0 comments on commit 54b1406

Please sign in to comment.