From fd8b31951105f26e84710e6500d46da1109ac3bd Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Mon, 25 Sep 2023 20:20:57 +0200
Subject: [PATCH 1/2] Make dartsim/World.hh header private

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
---
 dartsim/src/AddedMassFeatures_TEST.cc                | 3 ++-
 dartsim/src/CustomFeatures.hh                        | 3 +--
 dartsim/src/SDFFeatures_TEST.cc                      | 4 ++--
 dartsim/{include/gz/physics/dartsim => src}/World.hh | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename dartsim/{include/gz/physics/dartsim => src}/World.hh (100%)

diff --git a/dartsim/src/AddedMassFeatures_TEST.cc b/dartsim/src/AddedMassFeatures_TEST.cc
index 1eec689c5..525ce3e2b 100644
--- a/dartsim/src/AddedMassFeatures_TEST.cc
+++ b/dartsim/src/AddedMassFeatures_TEST.cc
@@ -32,7 +32,6 @@
 #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>
@@ -40,6 +39,8 @@
 
 #include <test/Utils.hh>
 
+#include "World.hh"
+
 struct TestFeatureList : gz::physics::FeatureList<
     gz::physics::GetEntities,
     gz::physics::GetBasicJointState,
diff --git a/dartsim/src/CustomFeatures.hh b/dartsim/src/CustomFeatures.hh
index 6c6b34646..199271668 100644
--- a/dartsim/src/CustomFeatures.hh
+++ b/dartsim/src/CustomFeatures.hh
@@ -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 {
diff --git a/dartsim/src/SDFFeatures_TEST.cc b/dartsim/src/SDFFeatures_TEST.cc
index b1c7218b5..e2ded061f 100644
--- a/dartsim/src/SDFFeatures_TEST.cc
+++ b/dartsim/src/SDFFeatures_TEST.cc
@@ -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>
@@ -54,6 +52,8 @@
 
 #include <test/Utils.hh>
 
+#include "World.hh"
+
 using namespace gz;
 
 struct TestFeatureList : physics::FeatureList<
diff --git a/dartsim/include/gz/physics/dartsim/World.hh b/dartsim/src/World.hh
similarity index 100%
rename from dartsim/include/gz/physics/dartsim/World.hh
rename to dartsim/src/World.hh

From e6a5408c11bb55a248561ad908b33fe648d50d9b Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Mon, 25 Sep 2023 20:54:34 +0200
Subject: [PATCH 2/2] Remove install CMake code

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
---
 dartsim/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dartsim/CMakeLists.txt b/dartsim/CMakeLists.txt
index 35b416bb3..e71d70ef4 100644
--- a/dartsim/CMakeLists.txt
+++ b/dartsim/CMakeLists.txt
@@ -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