Skip to content
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

Jump to bottom

Miscellaneous housekeeping #398

Merged
merged 3 commits into from
Oct 13, 2023
Merged

Miscellaneous housekeeping #398

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
34b31ff
Remove unused bazel file
mjcarroll Oct 12, 2023
9397692
Remove unused headers
mjcarroll Oct 12, 2023
18bf943
Allow factory to read from multiple locations
mjcarroll Oct 12, 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
2 changes: 1 addition & 1 deletion core/include/gz/msgs/convert/Pose.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions core/src/DynamicFactory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

Expand Down
76 changes: 0 additions & 76 deletions gz_msg_gen.bzl
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/integration/headers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
#include <gtest/gtest.h>

#include <gz/msgs/Export.hh>
#include "gz/msgs/contact.pb.h"

/////////////////////////////////////////////////
Expand Down
Loading