From 0d927a739e6630c971879dbb7b76d1c881f88d64 Mon Sep 17 00:00:00 2001
From: David Anthony <david.anthony@swri.org>
Date: Wed, 18 Sep 2024 10:43:25 -0500
Subject: [PATCH] Removing ros_environment usage in favor of directly checking
 package versions

---
 swri_image_util/CMakeLists.txt | 2 +-
 swri_image_util/package.xml    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/swri_image_util/CMakeLists.txt b/swri_image_util/CMakeLists.txt
index c351bba97..91f3aaa60 100644
--- 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
index 4d4e66527..06a6dc8d0 100644
--- 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>