Remove GZ_PHYSICS_ENGINE_INSTALL_DIR deprecation warnings (#2106)

Signed-off-by: Carlos Agüero <[email protected]>
gazebosim · Aug 31, 2023 · ecc91e8 · ecc91e8
1 parent 52167a6
commit ecc91e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/systems/physics/EntityFeatureMap_TEST.cc b/src/systems/physics/EntityFeatureMap_TEST.cc
@@ -25,6 +25,7 @@
 #include <gz/physics/Entity.hh>
 #include <gz/physics/ForwardStep.hh>
 #include <gz/physics/Implements.hh>
+#include <gz/physics/InstallationDirectories.hh>
 #include <gz/physics/Link.hh>
 #include <gz/physics/RemoveEntities.hh>
 #include <gz/physics/config.hh>
@@ -57,7 +58,7 @@ class EntityFeatureMapFixture: public InternalFixture<::testing::Test>
     const std::string pluginLib = "gz-physics-dartsim-plugin";
 
     common::SystemPaths systemPaths;
-    systemPaths.AddPluginPaths({GZ_PHYSICS_ENGINE_INSTALL_DIR});
+    systemPaths.AddPluginPaths(gz::physics::getEngineInstallDir());
 
     auto pathToLib = systemPaths.FindSharedLibrary(pluginLib);
     ASSERT_FALSE(pathToLib.empty())

diff --git a/src/systems/physics/Physics.cc b/src/systems/physics/Physics.cc
@@ -48,6 +48,7 @@
 #include <gz/physics/FeatureList.hh>
 #include <gz/physics/FeaturePolicy.hh>
 #include <gz/physics/heightmap/HeightmapShape.hh>
+#include <gz/physics/InstallationDirectories.hh>
 #include <gz/physics/RelativeQuantity.hh>
 #include <gz/physics/RequestEngine.hh>
 
@@ -806,7 +807,7 @@ void Physics::Configure(const Entity &_entity,
   // * Engines installed with gz-physics
   common::SystemPaths systemPaths;
   systemPaths.SetPluginPathEnv(this->dataPtr->pluginPathEnv);
-  systemPaths.AddPluginPaths({GZ_PHYSICS_ENGINE_INSTALL_DIR});
+  systemPaths.AddPluginPaths(gz::physics::getEngineInstallDir());
 
   auto pathToLib = systemPaths.FindSharedLibrary(pluginLib);
 

diff --git a/test/integration/tracked_vehicle_system.cc b/test/integration/tracked_vehicle_system.cc
@@ -33,6 +33,7 @@
 #include <gz/physics/ContactProperties.hh>
 #include <gz/physics/FeatureList.hh>
 #include <gz/physics/FeaturePolicy.hh>
+#include <gz/physics/InstallationDirectories.hh>
 #include <gz/physics/config.hh>
 #include <gz/plugin/Loader.hh>
 #include <gz/utils/ExtraTestMacros.hh>
@@ -111,7 +112,7 @@ class TrackedVehicleTest : public InternalFixture<::testing::Test>
     // modifications)
     common::SystemPaths systemPaths;
     systemPaths.SetPluginPathEnv("GZ_SIM_PHYSICS_ENGINE_PATH");
-    systemPaths.AddPluginPaths({GZ_PHYSICS_ENGINE_INSTALL_DIR});
+    systemPaths.AddPluginPaths(gz::physics::getEngineInstallDir());
 
     auto pathToLib = systemPaths.FindSharedLibrary(*pluginLib);
     ASSERT_FALSE(pathToLib.empty())