From 952f59897ccdd4328582b52d845159b2ad038cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Thu, 19 Dec 2024 15:18:52 +0100 Subject: [PATCH] Remove GZ_SIM_PLUGIN_INSTALL_DIR macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- Migration.md | 3 +++ include/gz/sim/config.hh.in | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Migration.md b/Migration.md index f14522f917..cde80dcc3b 100644 --- a/Migration.md +++ b/Migration.md @@ -19,6 +19,9 @@ release will remove the deprecated code. + The macro `GZ_SIM_SERVER_CONFIG_PATH` has been removed. Please use `gz::sim::getServerConfigPath()` instead. + + The macro `GZ_SIM_PLUGIN_INSTALL_DIR` has been removed. + Please use `gz::sim::getPluginInstallDir()` instead. + + The macro `GZ_SIM_GUI_PLUGIN_INSTALL_DIR` has been removed. Please use `gz::sim::getGUIPluginInstallDir()` instead. diff --git a/include/gz/sim/config.hh.in b/include/gz/sim/config.hh.in index 382e7ad0c5..87cca7d178 100644 --- a/include/gz/sim/config.hh.in +++ b/include/gz/sim/config.hh.in @@ -33,7 +33,6 @@ #define GZ_SIM_VERSION_HEADER "Gazebo Sim, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2018 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" -#define GZ_SIM_PLUGIN_INSTALL_DIR _Pragma ("GCC warning \"'GZ_SIM_PLUGIN_INSTALL_DIR' macro is deprecated, use gz::sim::getPluginInstallDir() function instead. \"") "${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins" #define GZ_DISTRIBUTION "${GZ_DISTRIBUTION}" #endif