Merged in hide_frame_semantics_2 (pull request gazebosim#623)

[Citadel] Hide frame semantics implementation part 2 Approved-by: Louise Poubel <lupoubel@hotmail.com>
kjeppesen1 · Dec 5, 2019 · 738c725 · 738c725
2 parents 77e15bb + 67c78aa
commit 738c725
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 9 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -75,6 +75,7 @@
 
 1. Hide FrameSemantics implementation.
     * [Pull request 622](https://bitbucket.org/osrf/sdformat/pull-requests/622)
+    * [Pull request 623](https://bitbucket.org/osrf/sdformat/pull-requests/623)
 
 ## SDFormat 8.0
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -143,12 +143,17 @@ if (IGNITION-TOOLS_BINARY_DIRS)
   )
 endif()
 
+sdf_build_tests(${gtest_sources})
+
 if (NOT WIN32)
   set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc)
   sdf_build_tests(Utils_TEST.cc)
 endif()
 
-sdf_build_tests(${gtest_sources})
+if (NOT WIN32)
+  set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc)
+  sdf_build_tests(FrameSemantics_TEST.cc)
+endif()
 
 sdf_add_library(${sdf_target} ${sources})
 target_link_libraries(${sdf_target} PUBLIC ${IGNITION-MATH_LIBRARIES})

diff --git a/src/Frame.cc b/src/Frame.cc
@@ -19,7 +19,7 @@
 #include "sdf/Frame.hh"
 #include "sdf/Error.hh"
 #include "sdf/Types.hh"
-#include "sdf/FrameSemantics.hh"
+#include "FrameSemantics.hh"
 #include "Utils.hh"
 
 using namespace sdf;

diff --git a/src/FrameSemantics.cc b/src/FrameSemantics.cc
@@ -25,7 +25,7 @@
 #include "sdf/Types.hh"
 #include "sdf/World.hh"
 
-#include "sdf/FrameSemantics.hh"
+#include "FrameSemantics.hh"
 
 namespace sdf
 {

diff --git a/include/sdf/FrameSemantics.hh → src/FrameSemantics.hh b/include/sdf/FrameSemantics.hh → src/FrameSemantics.hh
diff --git a/test/integration/frame_semantics.cc → src/FrameSemantics_TEST.cc b/test/integration/frame_semantics.cc → src/FrameSemantics_TEST.cc
@@ -23,7 +23,6 @@
 
 #include "sdf/Element.hh"
 #include "sdf/Frame.hh"
-#include "sdf/FrameSemantics.hh"
 #include "sdf/Filesystem.hh"
 #include "sdf/Model.hh"
 #include "sdf/Root.hh"
@@ -32,6 +31,7 @@
 #include "sdf/parser.hh"
 #include "sdf/sdf_config.h"
 
+#include "FrameSemantics.hh"
 #include "test_config.h"
 
 /////////////////////////////////////////////////

diff --git a/src/JointAxis.cc b/src/JointAxis.cc
@@ -18,7 +18,7 @@
 #include <ignition/math/Vector3.hh>
 #include "sdf/Error.hh"
 #include "sdf/JointAxis.hh"
-#include "sdf/FrameSemantics.hh"
+#include "FrameSemantics.hh"
 
 using namespace sdf;
 

diff --git a/src/Model.cc b/src/Model.cc
@@ -21,11 +21,11 @@
 #include <ignition/math/Pose3.hh>
 #include "sdf/Error.hh"
 #include "sdf/Frame.hh"
-#include "sdf/FrameSemantics.hh"
 #include "sdf/Joint.hh"
 #include "sdf/Link.hh"
 #include "sdf/Model.hh"
 #include "sdf/Types.hh"
+#include "FrameSemantics.hh"
 #include "Utils.hh"
 
 using namespace sdf;

diff --git a/src/SemanticPose.cc b/src/SemanticPose.cc
@@ -17,10 +17,10 @@
 #include <string>
 #include <ignition/math/Pose3.hh>
 #include "sdf/Assert.hh"
-#include "sdf/FrameSemantics.hh"
 #include "sdf/SemanticPose.hh"
 #include "sdf/Error.hh"
 #include "sdf/Types.hh"
+#include "FrameSemantics.hh"
 #include "Utils.hh"
 
 namespace sdf

diff --git a/src/World.cc b/src/World.cc
@@ -21,12 +21,12 @@
 
 #include "sdf/Actor.hh"
 #include "sdf/Frame.hh"
-#include "sdf/FrameSemantics.hh"
 #include "sdf/Light.hh"
 #include "sdf/Model.hh"
 #include "sdf/Physics.hh"
 #include "sdf/Types.hh"
 #include "sdf/World.hh"
+#include "FrameSemantics.hh"
 #include "Utils.hh"
 
 using namespace sdf;

diff --git a/src/parser.cc b/src/parser.cc
@@ -26,7 +26,6 @@
 #include "sdf/Converter.hh"
 #include "sdf/Filesystem.hh"
 #include "sdf/Frame.hh"
-#include "sdf/FrameSemantics.hh"
 #include "sdf/Joint.hh"
 #include "sdf/Link.hh"
 #include "sdf/Model.hh"
@@ -39,6 +38,8 @@
 #include "sdf/parser_urdf.hh"
 #include "sdf/sdf_config.h"
 
+#include "FrameSemantics.hh"
+
 namespace sdf
 {
 inline namespace SDF_VERSION_NAMESPACE {