From d8d0441804ece16008b504bdae3dbfab3531e544 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 26 Aug 2022 09:33:20 -0700 Subject: [PATCH] Add missing GZ_VERSION ticktocks (#289) Signed-off-by: methylDragon Signed-off-by: methylDragon --- ros_gz_bridge/CMakeLists.txt | 2 +- ros_gz_image/CMakeLists.txt | 3 +-- ros_gz_shims/ros_ign_gazebo/CMakeLists.txt | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ros_gz_bridge/CMakeLists.txt b/ros_gz_bridge/CMakeLists.txt index 57249f0f..305a786c 100644 --- a/ros_gz_bridge/CMakeLists.txt +++ b/ros_gz_bridge/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(trajectory_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_image/CMakeLists.txt b/ros_gz_image/CMakeLists.txt index 5552287c..fbd5a18b 100644 --- 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 index 78d8ef96..bac24631 100644 --- 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)