Add missing GZ_VERSION ticktocks (#289)

Signed-off-by: methylDragon <methylDragon@gmail.com> Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · Sep 22, 2022 · f3fe69e · f3fe69e
1 parent 5b231bc
commit f3fe69e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ros_gz_bridge/CMakeLists.txt b/ros_gz_bridge/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(yaml_cpp_vendor REQUIRED)
 # TODO(CH3): Deprecated. Remove on tock.
 if("$ENV{GZ_VERSION}" STREQUAL "" AND NOT "$ENV{IGNITION_VERSION}" STREQUAL "")
   message(DEPRECATION "Environment variable [IGNITION_VERSION] is deprecated. Use [GZ_VERSION] instead.")
-  set(ENV{GZ_VERSION} ENV{IGNITION_VERSION})
+  set(ENV{GZ_VERSION} $ENV{IGNITION_VERSION})
 endif()
 
 # Edifice

diff --git a/ros_gz_image/CMakeLists.txt b/ros_gz_image/CMakeLists.txt
@@ -16,11 +16,10 @@ find_package(ros_gz_bridge REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(sensor_msgs REQUIRED)
 
-
 # TODO(CH3): Deprecated. Remove on tock.
 if("$ENV{GZ_VERSION}" STREQUAL "" AND NOT "$ENV{IGNITION_VERSION}" STREQUAL "")
   message(DEPRECATION "Environment variable [IGNITION_VERSION] is deprecated. Use [GZ_VERSION] instead.")
-  set(ENV{GZ_VERSION} ENV{IGNITION_VERSION})
+  set(ENV{GZ_VERSION} $ENV{IGNITION_VERSION})
 endif()
 
 # Edifice

diff --git a/ros_gz_shims/ros_ign_gazebo/CMakeLists.txt b/ros_gz_shims/ros_ign_gazebo/CMakeLists.txt
@@ -22,6 +22,12 @@ ament_export_dependencies(
   ros_gz_bridge
 )
 
+# TODO(CH3): Deprecated. Remove on tock.
+if("$ENV{GZ_VERSION}" STREQUAL "" AND NOT "$ENV{IGNITION_VERSION}" STREQUAL "")
+  message(DEPRECATION "Environment variable [IGNITION_VERSION] is deprecated. Use [GZ_VERSION] instead.")
+  set(ENV{GZ_VERSION} $ENV{IGNITION_VERSION})
+endif()
+
 # Edifice
 if("$ENV{GZ_VERSION}" STREQUAL "edifice")
   find_package(ignition-gazebo5 REQUIRED)