Miscellaneous housekeeping (#398)

mjcarroll · web-flow · commit edd963278386 · 2023-10-13T09:19:32.000-05:00
Signed-off-by: Michael Carroll &lt;mjcarroll@intrinsic.ai&gt;
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"
 
 /////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,15 @@ DynamicFactory::DynamicFactory()`
`65`	`65`	`// Load all the descriptors found in the paths set with GZ_DESCRIPTOR_PATH.`
`66`	`66`	`this->LoadDescriptors(descPaths);`
`67`	`67`	`}`
`68`		`- else`
	`68`	`+`
	`69`	`+ auto globalPath =`
	`70`	`+ std::filesystem::path(gz::msgs::getInstallPrefix()) /`
	`71`	`+ "share" / "gz" / "protos";`
	`72`	`+`
	`73`	`+ if (std::filesystem::exists(globalPath))`
`69`	`74`	`{`
`70`	`75`	`// Load descriptors from the global share path`
`71`		`- this->LoadDescriptors((std::filesystem::path(`
`72`		`- gz::msgs::getInstallPrefix()) / "share" / "gz" / "protos").string());`
	`76`	`+ this->LoadDescriptors(globalPath.string());`
`73`	`77`	`}`
`74`	`78`	`}`
`75`	`79`