Add a dependency on ros_environment to ensure ROS_VERSION is set

KIT-MRT · Jul 31, 2020 · 72986c6 · 72986c6
1 parent c607eec
commit 72986c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(mrt_cmake_modules)
 
-
 if($ENV{ROS_VERSION} EQUAL 1)
     find_package(catkin REQUIRED)
     catkin_package(CFG_EXTRAS mrt_cmake_modules-extras.cmake)

diff --git a/package.xml b/package.xml
@@ -13,6 +13,8 @@
 
   <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend>
   <buildtool_depend condition="$ROS_VERSION == 2">ament_cmake_core</buildtool_depend>
+  <buildtool_depend>ros_environment</buildtool_depend>
+  <buildtool_export_depend>ros_environment</buildtool_export_depend>
   <buildtool_export_depend>lcov</buildtool_export_depend>
   <buildtool_export_depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg-modules</buildtool_export_depend>
   <buildtool_export_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg-modules</buildtool_export_depend>