Merge 18bf943 into 0622409

gazebosim · Oct 12, 2023 · 7c73127 · 7c73127
2 parents 0622409 + 18bf943
commit 7c73127
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 81 deletions.
diff --git a/core/include/gz/msgs/convert/Pose.hh b/core/include/gz/msgs/convert/Pose.hh
@@ -21,7 +21,7 @@
 #include <gz/msgs/convert/Quaternion.hh>
 
 // Message Headers
-#include "gz/msgs/details/quaternion.pb.h"
+#include "gz/msgs/quaternion.pb.h"
 #include "gz/msgs/pose.pb.h"
 
 // Data Headers

diff --git a/core/src/DynamicFactory.cc b/core/src/DynamicFactory.cc
@@ -65,11 +65,15 @@ DynamicFactory::DynamicFactory()
  // Load all the descriptors found in the paths set with GZ_DESCRIPTOR_PATH.
  this->LoadDescriptors(descPaths);
  }
- else
+
+ auto globalPath =
+ std::filesystem::path(gz::msgs::getInstallPrefix()) /
+ "share" / "gz" / "protos";
+
+ if (std::filesystem::exists(globalPath))
  {
  // Load descriptors from the global share path
- this->LoadDescriptors((std::filesystem::path(
- gz::msgs::getInstallPrefix()) / "share" / "gz" / "protos").string());
+ this->LoadDescriptors(globalPath.string());
  }
 }
 

diff --git a/gz_msg_gen.bzl b/gz_msg_gen.bzl
diff --git a/test/integration/headers.cc b/test/integration/headers.cc
@@ -16,7 +16,6 @@
 */
 #include <gtest/gtest.h>
 
-#include <gz/msgs/Export.hh>
 #include "gz/msgs/contact.pb.h"
 
 /////////////////////////////////////////////////