Skip to content

Commit

Permalink
Remove deprecations: tock
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Agüero <[email protected]>
  • Loading branch information
caguero committed Dec 5, 2024
1 parent 1bfdcbe commit f993aab
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 16 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ message(STATUS "-------------------------------------------\n")
set(GZ_PHYSICS_ENGINE_RELATIVE_INSTALL_DIR
${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
)
set(GZ_PHYSICS_ENGINE_INSTALL_DIR
${CMAKE_INSTALL_PREFIX}/${GZ_PHYSICS_ENGINE_RELATIVE_INSTALL_DIR}
)

#============================================================================
# Configure the build
Expand Down
7 changes: 7 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Deprecated code produces compile-time warnings. These warning serve as
notification to users that their code should be upgraded. The next major
release will remove the deprecated code.

## Gazebo Physics 8.X to 9.X

### Removals

* The environment variable `GZ_PHYSICS_ENGINE_INSTALL_DIR` is removed. Use
`gz::physics::getEngineInstallDir()` instead.

## Gazebo Physics 5.X to 6.X

### Deprecations
Expand Down
11 changes: 0 additions & 11 deletions dartsim/src/SDFFeatures_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -361,17 +361,6 @@ TEST_P(SDFFeatures_TEST, CheckDartsimData)
std::numeric_limits<double>::infinity(),
std::numeric_limits<double>::infinity());

/// \todo (anyone) getBodyNode("blah")->getFrictionCoeff is deprecated,
/// disabling these tests.
/*
EXPECT_DOUBLE_EQ(1.1, skeleton->getBodyNode("base")->getFrictionCoeff());
// The last collision element overwrites the value set by previous collision
// elements. We expect mu=1, the default value, instead of 0.1.
EXPECT_DOUBLE_EQ(1, skeleton->getBodyNode("upper_link")->getFrictionCoeff());
// Gets the default value when the <surface> tag is missing
EXPECT_DOUBLE_EQ(1, skeleton->getBodyNode("lower_link")->getFrictionCoeff());
*/

for (const auto * joint : {skeleton->getJoint(1), skeleton->getJoint(2)})
{
const auto * revolute =
Expand Down
2 changes: 0 additions & 2 deletions include/gz/physics/config.hh.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
#define GZ_PHYSICS_VERSION_FULL "${PROJECT_VERSION_FULL}"
#define GZ_PHYSICS_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}

#define GZ_PHYSICS_ENGINE_INSTALL_DIR _Pragma ("GCC warning \"'GZ_PHYSICS_ENGINE_INSTALL_DIR' macro is deprecated, use gz::physics::getEngineInstallDir() function instead. \"") "${GZ_PHYSICS_ENGINE_INSTALL_DIR}"

#define GZ_PHYSICS_VERSION_HEADER "Gazebo Physics, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"

#endif

0 comments on commit f993aab

Please sign in to comment.