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

[workspace] Remove drake_vendor prefix from our include paths #19936

Merged
merged 1 commit into from
Aug 6, 2023
Merged

[workspace] Remove drake_vendor prefix from our include paths #19936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 common/yaml/yaml_read_archive.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include <algorithm>
#include <cstring>

#include <drake_vendor/yaml-cpp/yaml.h>
#include <fmt/format.h>
#include <fmt/ostream.h>
#include <yaml-cpp/yaml.h>

#include "drake/common/nice_type_name.h"

Expand Down
4 changes: 2 additions & 2 deletions common/yaml/yaml_write_archive.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <utility>
#include <vector>

#include <drake_vendor/yaml-cpp/emitfromevents.h>
#include <drake_vendor/yaml-cpp/yaml.h>
#include <yaml-cpp/emitfromevents.h>
#include <yaml-cpp/yaml.h>

#include "drake/common/drake_assert.h"
#include "drake/common/unused.h"
Expand Down
4 changes: 2 additions & 2 deletions geometry/meshcat.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#include <App.h>
#include <common_robotics_utilities/base64_helpers.hpp>
#include <drake_vendor/msgpack.hpp>
#include <drake_vendor/uuid.h>
#include <fmt/format.h>
#include <msgpack.hpp>
#include <uuid.h>

#include "drake/common/drake_export.h"
#include "drake/common/drake_throw.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/meshcat_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <variant>
#include <vector>

#include <drake_vendor/msgpack.hpp>
#include <msgpack.hpp>

#include "drake/common/nice_type_name.h"
#include "drake/geometry/meshcat.h"
Expand Down
8 changes: 4 additions & 4 deletions geometry/optimization/hpolyhedron.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#include <tuple>

#include <Eigen/Eigenvalues>
#include <drake_vendor/libqhullcpp/Coordinates.h>
#include <drake_vendor/libqhullcpp/Qhull.h>
#include <drake_vendor/libqhullcpp/QhullFacet.h>
#include <drake_vendor/libqhullcpp/QhullFacetList.h>
#include <fmt/format.h>
#include <libqhullcpp/Coordinates.h>
#include <libqhullcpp/Qhull.h>
#include <libqhullcpp/QhullFacet.h>
#include <libqhullcpp/QhullFacetList.h>

#include "drake/geometry/optimization/vpolytope.h"
#include "drake/math/matrix_util.h"
Expand Down
4 changes: 2 additions & 2 deletions geometry/optimization/vpolytope.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include <numeric>
#include <string>

#include <drake_vendor/libqhullcpp/Qhull.h>
#include <drake_vendor/libqhullcpp/QhullVertexSet.h>
#include <fmt/format.h>
#include <libqhullcpp/Qhull.h>
#include <libqhullcpp/QhullVertexSet.h>

#include "drake/common/is_approx_equal_abstol.h"
#include "drake/geometry/read_obj.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/collisions_exist_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>

#include "drake/common/drake_assert.h"
#include "drake/common/drake_export.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/distance_to_point_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <unordered_map>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>

#include "drake/common/drake_assert.h"
#include "drake/common/drake_export.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/distance_to_shape_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <unordered_map>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>

#include "drake/common/drake_export.h"
#include "drake/common/eigen_types.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/find_collision_candidates_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <fmt/format.h>

#include "drake/common/drake_export.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/hydroelastic_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <fmt/format.h>

#include "drake/common/drake_export.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/penetration_as_point_pair_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <unordered_map>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>

#include "drake/common/drake_export.h"
#include "drake/geometry/proximity/collision_filter.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/proximity_utilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <string>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <fmt/format.h>

#include "drake/common/drake_export.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/test/characterization_utilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <gtest/gtest.h>

#include "drake/common/default_scalars.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/test/collisions_exist_callback_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <utility>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <gtest/gtest.h>

#include "drake/geometry/proximity/proximity_utilities.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/test/distance_sphere_to_shape_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <fmt/format.h>
#include <gtest/gtest.h>

Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/test/distance_to_point_callback_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "drake/geometry/proximity/distance_to_point_callback.h"

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <gtest/gtest.h>

#include "drake/common/fmt_eigen.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/test/find_collision_candidates_callback_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <gtest/gtest.h>

#include "drake/geometry/proximity/proximity_utilities.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/test/hydroelastic_callback_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <gtest/gtest.h>

#include "drake/common/test_utilities/expect_no_throw.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity/test/proximity_utilities_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <memory>
#include <sstream>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <gtest/gtest.h>

namespace drake {
Expand Down
2 changes: 1 addition & 1 deletion geometry/proximity_engine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <fmt/format.h>

#include "drake/common/default_scalars.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/render_gltf_client/internal_merge_gltf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <filesystem>

#include <drake_vendor/nlohmann/json.hpp>
#include <nlohmann/json.hpp>

#include "drake/common/eigen_types.h"

Expand Down
2 changes: 1 addition & 1 deletion geometry/render_gltf_client/internal_render_engine_gltf_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <memory>
#include <string>

#include <drake_vendor/nlohmann/json.hpp>
#include <nlohmann/json.hpp>

#include "drake/common/drake_export.h"
#include "drake/geometry/render/render_camera.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/render_gltf_client/test/internal_merge_gltf_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <string>
#include <vector>

#include <drake_vendor/nlohmann/json.hpp>
#include <gtest/gtest.h>
#include <nlohmann/json.hpp>

#include "drake/common/find_resource.h"
#include "drake/common/test_utilities/eigen_matrix_compare.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/render_gltf_client/test/internal_render_engine_gltf_client_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <set>
#include <vector>

#include <drake_vendor/nlohmann/json.hpp>
#include <gtest/gtest.h>
#include <nlohmann/json.hpp>
#include <vtkCamera.h>
#include <vtkMatrix4x4.h>

Expand Down
2 changes: 1 addition & 1 deletion geometry/test/meshcat_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#include <filesystem>
#include <thread>

#include <drake_vendor/msgpack.hpp>
#include <fmt/format.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <msgpack.hpp>

#include "drake/common/find_resource.h"
#include "drake/common/test_utilities/eigen_matrix_compare.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/test/meshcat_visualizer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <thread>

#include <drake_vendor/msgpack.hpp>
#include <gtest/gtest.h>
#include <msgpack.hpp>

#include "drake/common/find_resource.h"
#include "drake/common/test_utilities/expect_throws_message.h"
Expand Down
2 changes: 1 addition & 1 deletion geometry/test/proximity_engine_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <utility>
#include <vector>

#include <drake_vendor/fcl/fcl.h>
#include <fcl/fcl.h>
#include <fmt/ostream.h>
#include <gtest/gtest.h>

Expand Down
4 changes: 2 additions & 2 deletions multibody/parsing/detail_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <string>
#include <variant>

#include <drake_vendor/sdf/Element.hh>
#include <drake_vendor/tinyxml2.h>
#include <sdf/Element.hh>
#include <tinyxml2.h>

#include "drake/common/diagnostic_policy.h"
#include "drake/common/drake_copyable.h"
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/detail_ignition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <drake_vendor/gz/math/Pose3.hh>
#include <gz/math/Pose3.hh>

#include "drake/common/eigen_types.h"
#include "drake/math/rigid_transform.h"
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/detail_mujoco_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <utility>
#include <vector>

#include <drake_vendor/tinyxml2.h>
#include <fmt/format.h>
#include <tinyxml2.h>

#include "drake/geometry/shape_specification.h"
#include "drake/math/rigid_transform.h"
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/detail_sdf_diagnostic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <set>
#include <string>

#include <drake_vendor/sdf/Element.hh>
#include <sdf/Element.hh>

#include "drake/common/diagnostic_policy.h"
#include "drake/multibody/parsing/detail_common.h"
Expand Down
14 changes: 7 additions & 7 deletions multibody/parsing/detail_sdf_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
#include <string>
#include <utility>

#include <drake_vendor/sdf/Box.hh>
#include <drake_vendor/sdf/Capsule.hh>
#include <drake_vendor/sdf/Cylinder.hh>
#include <drake_vendor/sdf/Element.hh>
#include <drake_vendor/sdf/Ellipsoid.hh>
#include <drake_vendor/sdf/Plane.hh>
#include <drake_vendor/sdf/Sphere.hh>
#include <sdf/Box.hh>
#include <sdf/Capsule.hh>
#include <sdf/Cylinder.hh>
#include <sdf/Element.hh>
#include <sdf/Ellipsoid.hh>
#include <sdf/Plane.hh>
#include <sdf/Sphere.hh>

#include "drake/geometry/geometry_instance.h"
#include "drake/geometry/proximity_properties.h"
Expand Down
6 changes: 3 additions & 3 deletions multibody/parsing/detail_sdf_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#include <optional>
#include <string>

#include <drake_vendor/sdf/Collision.hh>
#include <drake_vendor/sdf/Geometry.hh>
#include <drake_vendor/sdf/Visual.hh>
#include <sdf/Collision.hh>
#include <sdf/Geometry.hh>
#include <sdf/Visual.hh>

#include "drake/common/diagnostic_policy.h"
#include "drake/geometry/geometry_instance.h"
Expand Down
18 changes: 9 additions & 9 deletions multibody/parsing/detail_sdf_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
#include <variant>
#include <vector>

#include <drake_vendor/sdf/Error.hh>
#include <drake_vendor/sdf/Frame.hh>
#include <drake_vendor/sdf/Joint.hh>
#include <drake_vendor/sdf/JointAxis.hh>
#include <drake_vendor/sdf/Link.hh>
#include <drake_vendor/sdf/Model.hh>
#include <drake_vendor/sdf/ParserConfig.hh>
#include <drake_vendor/sdf/Root.hh>
#include <drake_vendor/sdf/World.hh>
#include <sdf/Error.hh>
#include <sdf/Frame.hh>
#include <sdf/Joint.hh>
#include <sdf/JointAxis.hh>
#include <sdf/Link.hh>
#include <sdf/Model.hh>
#include <sdf/ParserConfig.hh>
#include <sdf/Root.hh>
#include <sdf/World.hh>

#include "drake/geometry/geometry_instance.h"
#include "drake/math/rigid_transform.h"
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/detail_tinyxml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <vector>

#include <Eigen/Dense>
#include <drake_vendor/tinyxml2.h>
#include <tinyxml2.h>

#include "drake/common/diagnostic_policy.h"
#include "drake/math/rigid_transform.h"
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/detail_tinyxml2_diagnostic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include <drake_vendor/tinyxml2.h>
#include <tinyxml2.h>

#include "drake/common/diagnostic_policy.h"
#include "drake/multibody/parsing/detail_common.h"
Expand Down
2 changes: 1 addition & 1 deletion multibody/parsing/detail_urdf_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <utility>

#include <Eigen/Dense>
#include <drake_vendor/tinyxml2.h>
#include <tinyxml2.h>

#include "drake/common/diagnostic_policy.h"
#include "drake/geometry/geometry_instance.h"
Expand Down
Loading