Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove GZ_PHYSICS_ENGINE_INSTALL_DIR deprecation warnings #2106

Merged
merged 2 commits into from
Aug 31, 2023
Merged

Remove GZ_PHYSICS_ENGINE_INSTALL_DIR deprecation warnings #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
023d9b6
Remove deprecation warnings.
caguero Aug 31, 2023
886daba
Tweak
caguero Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/systems/physics/EntityFeatureMap_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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())
Expand Down
3 changes: 2 additions & 1 deletion src/systems/physics/Physics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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);

Expand Down
3 changes: 2 additions & 1 deletion test/integration/tracked_vehicle_system.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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())
Expand Down