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

Use the versioned name of the DART physics plugin #369

Merged
merged 1 commit into from
Jul 2, 2021
Merged

Use the versioned name of the DART physics plugin #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions scenario/src/gazebo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ target_link_libraries(ScenarioGazebo
PRIVATE
ScenarioCore::CoreUtils
ScenarioGazebo::ExtraComponents
${ignition-physics.ignition-physics}
${ignition-fuel_tools.ignition-fuel_tools})

set_target_properties(ScenarioGazebo PROPERTIES
Expand Down
5 changes: 4 additions & 1 deletion scenario/src/gazebo/src/World.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <ignition/gazebo/components/Pose.hh>
#include <ignition/math/Pose3.hh>
#include <ignition/math/Vector3.hh>
#include <ignition/physics/config.hh>
#include <sdf/Element.hh>
#include <sdf/Model.hh>
#include <sdf/Root.hh>
Expand Down Expand Up @@ -245,7 +246,9 @@ bool World::setPhysicsEngine(const PhysicsEngine engine)
const std::string pluginLib = [&engine]() -> std::string {
switch (engine) {
case PhysicsEngine::Dart:
return "ignition-physics-dartsim-plugin";
return "ignition-physics"
+ std::to_string(IGNITION_PHYSICS_MAJOR_VERSION)
+ "-dartsim-plugin";
}
return "";
}();
Expand Down