Removing ros_environment usage in favor of directly checking package …

…versions (#754)
swri-robotics · Sep 18, 2024 · 429a257 · 429a257
1 parent 68abeae
commit 429a257
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/swri_image_util/CMakeLists.txt b/swri_image_util/CMakeLists.txt
@@ -109,7 +109,7 @@ ament_target_dependencies(${PROJECT_NAME}_nodes
 )
 
 # Iron and later switched some cv_bridge files to .hpp from .h
-if ("$ENV{ROS_DISTRO}" STRLESS "iron")
+if ("${cv_bridge_VERSION}" VERSION_LESS "3.3.0")
   target_compile_definitions(${PROJECT_NAME}_nodes PRIVATE "-DUSE_CVBRIDGE_H_FILES")
 endif()
 

diff --git a/swri_image_util/package.xml b/swri_image_util/package.xml
@@ -14,8 +14,6 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>pkg-config</buildtool_depend>
 
-  <build_depend>ros_environment</build_depend>
-
   <depend>ament_index_cpp</depend>
   <depend>boost</depend>
   <depend>camera_calibration_parsers</depend>