Skip to content

Make dartsim/World.hh header private #551

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

Merged
merged 3 commits into from
Sep 26, 2023
Merged

Make dartsim/World.hh header private #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd8b319
Make dartsim/World.hh header private
j-rivero Sep 25, 2023
e6a5408
Remove install CMake code
j-rivero Sep 25, 2023
ab38813
Merge branch 'gz-physics7' into jrivero/dartsim_header_move
j-rivero Sep 26, 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
4 changes: 0 additions & 4 deletions dartsim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ if (MSVC)
target_compile_options(${features} INTERFACE "/permissive-")
endif()

install(
DIRECTORY include/
DESTINATION "${GZ_INCLUDE_INSTALL_DIR_FULL}")

gz_get_libsources_and_unittests(sources test_sources)

# TODO(MXG): Think about a gz_add_plugin(~) macro for gz-cmake
Expand Down
3 changes: 2 additions & 1 deletion dartsim/src/AddedMassFeatures_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
#include <gz/physics/sdf/ConstructLink.hh>
#include <gz/physics/sdf/ConstructModel.hh>
#include <gz/physics/sdf/ConstructWorld.hh>
#include <gz/physics/dartsim/World.hh>

#include <sdf/Link.hh>
#include <sdf/Root.hh>
#include <sdf/World.hh>

#include <test/Utils.hh>

#include "World.hh"

struct TestFeatureList : gz::physics::FeatureList<
gz::physics::GetEntities,
gz::physics::GetBasicJointState,
Expand Down
3 changes: 1 addition & 2 deletions dartsim/src/CustomFeatures.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@

#include <gz/physics/Implements.hh>

#include <gz/physics/dartsim/World.hh>

#include "Base.hh"
#include "World.hh"

namespace gz {
namespace physics {
Expand Down
4 changes: 2 additions & 2 deletions dartsim/src/SDFFeatures_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
#include <gz/physics/sdf/ConstructNestedModel.hh>
#include <gz/physics/sdf/ConstructWorld.hh>

#include <gz/physics/dartsim/World.hh>

#include <sdf/Collision.hh>
#include <sdf/Joint.hh>
#include <sdf/JointAxis.hh>
Expand All @@ -54,6 +52,8 @@

#include <test/Utils.hh>

#include "World.hh"

using namespace gz;

struct TestFeatureList : physics::FeatureList<
Expand Down
0 dartsim/include/gz/physics/dartsim/World.hh → dartsim/src/World.hh
View file
Open in desktop
File renamed without changes.