From d41b1102757234cf2ffcd4b8c0ea874a951ff832 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 2 Dec 2024 19:31:31 +0000 Subject: [PATCH 1/7] Change to globbed bazel targets For ease of non-bazel maintainers lives Signed-off-by: Michael Carroll --- BUILD.bazel | 1449 ++---------------------------------------- eigen3/BUILD.bazel | 69 +- examples/BUILD.bazel | 154 +---- 3 files changed, 80 insertions(+), 1592 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 141dc267..96647165 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -4,7 +4,7 @@ load("@rules_license//rules:license.bzl", "license") package( default_applicable_licenses = [":license"], - default_visibility = ["//visibility:public"], + default_visibility = ["__subpackages__"], features = [ "layering_check", "parse_headers", @@ -36,1439 +36,66 @@ gz_configure_header( package_xml = "package.xml", ) -cc_library( - name = "AdditivelySeparableScalarField3", - hdrs = ["include/gz/math/AdditivelySeparableScalarField3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Region3", - ":Vector3", - ], -) - -cc_test( - name = "AdditivelySeparableScalarField3_TEST", - srcs = ["src/AdditivelySeparableScalarField3_TEST.cc"], - deps = [ - ":AdditivelySeparableScalarField3", - ":Polynomial3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Angle", - srcs = ["src/Angle.cc"], - hdrs = ["include/gz/math/Angle.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ], -) - -cc_test( - name = "Angle_TEST", - srcs = ["src/Angle_TEST.cc"], - deps = [ - ":Angle", - ":Helpers", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "AxisAlignedBox", - srcs = ["src/AxisAlignedBox.cc"], - hdrs = ["include/gz/math/AxisAlignedBox.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Line3", - ":MassMatrix3", - ":Material", - ":Vector3", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "AxisAlignedBox_TEST", - srcs = ["src/AxisAlignedBox_TEST.cc"], - deps = [ - ":AxisAlignedBox", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Box", - hdrs = [ - "include/gz/math/Box.hh", - "include/gz/math/detail/Box.hh", - "include/gz/math/detail/WellOrderedVector.hh", - ], - includes = ["include"], - deps = [ - ":Config", - ":Line2", - ":MassMatrix3", - ":Material", - ":Plane", - ":Triangle3", - ":Vector3", - ], -) - -cc_test( - name = "Box_TEST", - srcs = ["src/Box_TEST.cc"], - deps = [ - ":Box", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Capsule", - hdrs = [ - "include/gz/math/Capsule.hh", - "include/gz/math/detail/Capsule.hh", - ], - includes = ["include"], - deps = [ - ":Helpers", - ":Inertial", - ":MassMatrix3", - ":Material", - ], -) - -cc_test( - name = "Capsule_TEST", - srcs = ["src/Capsule_TEST.cc"], - deps = [ - ":Capsule", - ":Helpers", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Color", - srcs = ["src/Color.cc"], - hdrs = [ - "include/gz/math/Color.hh", - ], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Vector3", - ], -) - -cc_test( - name = "Color_TEST", - srcs = ["src/Color_TEST.cc"], - deps = [ - ":Color", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Cone", - hdrs = [ - "include/gz/math/Cone.hh", - "include/gz/math/detail/Cone.hh", +public_headers = glob( + include = [ + "include/gz/math/*.hh", + "include/gz/math/detail/*.hh", + "include/gz/math/graph/*.hh", ], - includes = ["include"], - deps = [ - ":MassMatrix3", - ":Material", - ":Quaternion", - ], -) - -cc_test( - name = "Cone_TEST", - srcs = ["src/Cone_TEST.cc"], - deps = [ - ":Cone", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "CoordinateVector3", - srcs = ["src/CoordinateVector3.cc"], - hdrs = ["include/gz/math/CoordinateVector3.hh"], - includes = ["include"], - deps = [ - ":Angle", - ":Config", - ":Helpers", - ":Vector3", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "CoordinateVector3_TEST", - srcs = ["src/CoordinateVector3_TEST.cc"], - deps = [ - ":Angle", - ":CoordinateVector3", - ":Helpers", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Cylinder", - hdrs = [ - "include/gz/math/Cylinder.hh", - "include/gz/math/detail/Cylinder.hh", - ], - includes = ["include"], - deps = [ - ":MassMatrix3", - ":Material", - ":Quaternion", - ], -) - -cc_test( - name = "Cylinder_TEST", - srcs = ["src/Cylinder_TEST.cc"], - deps = [ - ":Cylinder", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "DiffDriveOdometry", - srcs = ["src/DiffDriveOdometry.cc"], - hdrs = [ - "include/gz/math/DiffDriveOdometry.hh", - ], - includes = ["include"], - deps = [ - ":Angle", - ":Config", - ":Export", - ":RollingMean", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "DiffDriveOdometry_TEST", - srcs = ["src/DiffDriveOdometry_TEST.cc"], - deps = [ - ":Angle", - ":DiffDriveOdometry", - ":Helpers", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Ellipsoid", - hdrs = [ - "include/gz/math/Ellipsoid.hh", - "include/gz/math/detail/Ellipsoid.hh", - ], - includes = ["include"], - deps = [ - ":Helpers", - ":Inertial", - ":MassMatrix3", - ":Material", + exclude = [ + "include/gz/math/sdf.hh", ], ) -cc_test( - name = "Ellipsoid_TEST", - srcs = ["src/Ellipsoid_TEST.cc"], - deps = [ - ":Ellipsoid", - ":Helpers", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], +private_headers = glob( + include = ["src/*.hh"], ) -cc_library( - name = "Filter", - hdrs = ["include/gz/math/Filter.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Quaternion", - ":Vector3", +sources = glob( + include = [ + "src/*.cc", + "src/bazel/*.cc", ], -) - -cc_test( - name = "Filter_TEST", - srcs = ["src/Filter_TEST.cc"], - deps = [ - ":Filter", - "@googletest//:gtest", - "@googletest//:gtest_main", + exclude = [ + "src/*_TEST.cc", ], ) cc_library( - name = "Frustum", - srcs = ["src/Frustum.cc"], - hdrs = ["include/gz/math/Frustum.hh"], - includes = ["include"], - deps = [ - ":Angle", - ":AxisAlignedBox", - ":Config", - ":Matrix4", - ":Plane", - ":Pose3", - "@gz-utils//:ImplPtr", + name = "math", + srcs = sources + private_headers, + hdrs = public_headers, + includes = [ + "include", + "src", ], -) - -cc_test( - name = "Frustum_TEST", - srcs = ["src/Frustum_TEST.cc"], - deps = [ - ":Frustum", - ":Helpers", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "GaussMarkovProcess", - srcs = ["src/GaussMarkovProcess.cc"], - hdrs = ["include/gz/math/GaussMarkovProcess.hh"], - includes = ["include"], + visibility = ["//visibility:public"], deps = [ ":Config", ":Export", - ":Rand", "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "GaussMarkovProcess_TEST", - srcs = ["src/GaussMarkovProcess_TEST.cc"], - deps = [ - ":GaussMarkovProcess", - ":Rand", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Graph", - hdrs = [ - "include/gz/math/graph/Edge.hh", - "include/gz/math/graph/Graph.hh", - "include/gz/math/graph/Vertex.hh", - ], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - "@gz-utils//:NeverDestroyed", - ], -) - -cc_test( - name = "Edge_TEST", - srcs = ["src/graph/Edge_TEST.cc"], - deps = [ - ":Graph", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_test( - name = "Graph_TEST", - srcs = ["src/graph/Graph_TEST.cc"], - deps = [ - ":Graph", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_test( - name = "GraphAlgorithms_TEST", - srcs = ["src/graph/GraphAlgorithms_TEST.cc"], - deps = [ - ":Graph", - ":GraphAlgorithms", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_test( - name = "GraphDirected_TEST", - srcs = ["src/graph/GraphDirected_TEST.cc"], - deps = [ - ":Graph", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_test( - name = "GraphUndirected_TEST", - srcs = ["src/graph/GraphUndirected_TEST.cc"], - deps = [ - ":Graph", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_test( - name = "Vertex_TEST", - srcs = ["src/graph/Vertex_TEST.cc"], - deps = [ - ":Graph", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "GraphAlgorithms", - hdrs = [ - "include/gz/math/graph/GraphAlgorithms.hh", - ], - includes = ["include"], - deps = [ - ":Config", - ":Graph", - ":Helpers", - ], -) - -cc_library( - name = "Helpers", - srcs = ["src/Helpers.cc"], - hdrs = ["include/gz/math/Helpers.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Export", "@gz-utils//:NeverDestroyed", ], ) -cc_test( - name = "Helpers_TEST", - srcs = ["src/Helpers_TEST.cc"], - deps = [ - ":Helpers", - ":Rand", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - "@gz-utils//:SuppressWarning", - ], -) - -cc_library( - name = "Inertial", - hdrs = ["include/gz/math/Inertial.hh"], - includes = ["include"], - deps = [ - ":Config", - ":MassMatrix3", - ":Matrix3", - ":Matrix6", - ":Pose3", - ], -) - -cc_test( - name = "Inertial_TEST", - srcs = ["src/Inertial_TEST.cc"], - deps = [ - ":Inertial", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "InterpolationPoint", - hdrs = [ - "include/gz/math/detail/AxisIndex.hh", - "include/gz/math/detail/InterpolationPoint.hh", - ], - includes = ["include"], - deps = [ - ":Vector2", - ":Vector3", - ], -) - -cc_test( - name = "InterpolationPoint_TEST", - srcs = ["src/InterpolationPoint_TEST.cc"], - deps = [ - ":InterpolationPoint", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Interval", - hdrs = ["include/gz/math/Interval.hh"], - includes = ["include"], - deps = [ - ":Config", - ], -) - -cc_test( - name = "Interval_TEST", - srcs = ["src/Interval_TEST.cc"], - deps = [ - ":Interval", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Kmeans", - srcs = [ - "src/Kmeans.cc", - "src/KmeansPrivate.hh", - ], - hdrs = ["include/gz/math/Kmeans.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Rand", - ":Vector3", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "Kmeans_TEST", - srcs = ["src/Kmeans_TEST.cc"], - deps = [ - ":Kmeans", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Line2", - hdrs = ["include/gz/math/Line2.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Vector2", - ], -) - -cc_test( - name = "Line2_TEST", - srcs = ["src/Line2_TEST.cc"], - deps = [ - ":Helpers", - ":Line2", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Line3", - hdrs = ["include/gz/math/Line3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Vector3", - ], -) - -cc_test( - name = "Line3_TEST", - srcs = ["src/Line3_TEST.cc"], - deps = [ - ":Helpers", - ":Line3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "MassMatrix3", - hdrs = ["include/gz/math/MassMatrix3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Material", - ":Matrix3", - ":Quaternion", - ":Vector2", - ":Vector3", - ], -) - -cc_test( - name = "MassMatrix3_TEST", - srcs = ["src/MassMatrix3_TEST.cc"], - deps = [ - ":Helpers", - ":MassMatrix3", - ":Material", - "@googletest//:gtest", - "@googletest//:gtest_main", +test_sources = glob( + include = [ + "src/*_TEST.cc", ], ) -cc_library( - name = "MaterialType", - hdrs = ["include/gz/math/MaterialType.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Export", - ], -) - -cc_library( - name = "Material", - srcs = [ - "src/Material.cc", - "src/MaterialType.hh", - ], - hdrs = ["include/gz/math/Material.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Export", - ":Helpers", - ":MaterialType", - "@gz-utils//:ImplPtr", - ], -) - -cc_library( - name = "Matrix3", - hdrs = ["include/gz/math/Matrix3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Vector3", - ], -) - -cc_test( - name = "Matrix3_TEST", - srcs = ["src/Matrix3_TEST.cc"], - deps = [ - ":Helpers", - ":Matrix3", - ":Quaternion", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Matrix4", - hdrs = ["include/gz/math/Matrix4.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Matrix3", - ":Pose3", - ":Quaternion", - ":Vector3", - ], -) - -cc_test( - name = "Matrix4_TEST", - srcs = ["src/Matrix4_TEST.cc"], - deps = [ - ":Matrix4", - ":Pose3", - ":Quaternion", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Matrix6", - hdrs = ["include/gz/math/Matrix6.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Matrix3", - ":Vector3", - ], -) - -cc_test( - name = "Matrix6_TEST", - srcs = ["src/Matrix6_TEST.cc"], - deps = [ - ":Helpers", - ":Matrix6", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "MecanumDriveOdometry", - srcs = ["src/MecanumDriveOdometry.cc"], - hdrs = ["include/gz/math/MecanumDriveOdometry.hh"], - includes = ["include"], - deps = [ - ":Angle", - ":Config", - ":Export", - ":RollingMean", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "MecanumDriveOdometry_TEST", - srcs = ["src/MecanumDriveOdometry_TEST.cc"], - deps = [ - ":Angle", - ":Helpers", - ":MecanumDriveOdometry", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "MovingWindowFilter", - hdrs = ["include/gz/math/MovingWindowFilter.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Export", - ":Vector3", - "@googletest//:gtest", - "@gz-utils//:SuppressWarning", - ], -) - -cc_test( - name = "MovingWindowFilter_TEST", - srcs = ["src/MovingWindowFilter_TEST.cc"], - deps = [ - ":MovingWindowFilter", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "OrientedBox", - hdrs = ["include/gz/math/OrientedBox.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":MassMatrix3", - ":Material", - ":Matrix4", - ":Pose3", - ":Vector3", - ], -) - -cc_test( - name = "OrientedBox_TEST", - srcs = ["src/OrientedBox_TEST.cc"], - deps = [ - ":Angle", - ":OrientedBox", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "PID", - srcs = ["src/PID.cc"], - hdrs = ["include/gz/math/PID.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "PID_TEST", - srcs = ["src/PID_TEST.cc"], - deps = [ - ":Angle", - ":Helpers", - ":PID", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "PiecewiseScalarField3", - hdrs = ["include/gz/math/PiecewiseScalarField3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Region3", - ":Vector3", - ], -) - -cc_test( - name = "PiecewiseScalarField3_TEST", - srcs = ["src/PiecewiseScalarField3_TEST.cc"], - deps = [ - ":AdditivelySeparableScalarField3", - ":PiecewiseScalarField3", - ":Polynomial3", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Plane", - hdrs = ["include/gz/math/Plane.hh"], - includes = ["include"], - deps = [ - ":AxisAlignedBox", - ":Config", - ":Line2", - ":Quaternion", - ":Vector2", - ":Vector3", - ], -) - -cc_test( - name = "Plane_TEST", - srcs = ["src/Plane_TEST.cc"], - deps = [ - ":Helpers", - ":Plane", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Polynomial3", - hdrs = ["include/gz/math/Polynomial3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Interval", - ":Vector4", - ], -) - -cc_test( - name = "Polynomial3_TEST", - srcs = ["src/Polynomial3_TEST.cc"], - deps = [ - ":Polynomial3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Pose3", - hdrs = ["include/gz/math/Pose3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Quaternion", - ":Vector3", - ], -) - -cc_test( - name = "Pose_TEST", - srcs = ["src/Pose_TEST.cc"], - deps = [ - ":Helpers", - ":Pose3", - "@googletest//:gtest", - "@googletest//:gtest_main", - "@gz-utils//:SuppressWarning", - ], -) - -cc_library( - name = "Quaternion", - hdrs = ["include/gz/math/Quaternion.hh"], - includes = ["include"], - deps = [ - ":Angle", - ":Config", - ":Helpers", - ":Matrix3", - ":Vector3", - ], -) - -cc_test( - name = "Quaternion_TEST", - srcs = ["src/Quaternion_TEST.cc"], - deps = [ - ":Helpers", - ":Matrix3", - ":Matrix4", - ":Quaternion", - "@googletest//:gtest", - "@googletest//:gtest_main", - "@gz-utils//:SuppressWarning", - ], -) - -cc_library( - name = "Rand", - srcs = ["src/Rand.cc"], - hdrs = ["include/gz/math/Rand.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ], -) - -cc_test( - name = "Rand_TEST", - srcs = ["src/Rand_TEST.cc"], - deps = [ - ":Helpers", - ":Rand", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Region3", - hdrs = ["include/gz/math/Region3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Interval", - ":Vector3", - ], -) - -cc_test( - name = "Region3_TEST", - srcs = ["src/Region3_TEST.cc"], - deps = [ - ":Region3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "RollingMean", - srcs = ["src/RollingMean.cc"], - hdrs = ["include/gz/math/RollingMean.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Export", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "RollingMean_TEST", - srcs = ["src/RollingMean_TEST.cc"], - deps = [ - ":Helpers", - ":RollingMean", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "RotationSpline", - srcs = ["src/RotationSpline.cc"], - hdrs = ["include/gz/math/RotationSpline.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Quaternion", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "RotationSpline_TEST", - srcs = ["src/RotationSpline_TEST.cc"], - deps = [ - ":Helpers", - ":Quaternion", - ":RotationSpline", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "SemanticVersion", - srcs = ["src/SemanticVersion.cc"], - hdrs = ["include/gz/math/SemanticVersion.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "SemanticVersion_TEST", - srcs = ["src/SemanticVersion_TEST.cc"], - deps = [ - ":SemanticVersion", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "SignalStats", - srcs = ["src/SignalStats.cc"], - hdrs = ["include/gz/math/SignalStats.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "SignalStats_TEST", - srcs = ["src/SignalStats_TEST.cc"], - deps = [ - ":Rand", - ":SignalStats", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "SpeedLimiter", - srcs = ["src/SpeedLimiter.cc"], - hdrs = ["include/gz/math/SpeedLimiter.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "SpeedLimiter_TEST", - srcs = ["src/SpeedLimiter_TEST.cc"], - deps = [ - ":Helpers", - ":SpeedLimiter", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Sphere", - hdrs = [ - "include/gz/math/Sphere.hh", - "include/gz/math/detail/Sphere.hh", - ], - includes = ["include"], - deps = [ - ":MassMatrix3", - ":Material", - ":Plane", - ":Quaternion", - ], -) - -cc_test( - name = "Sphere_TEST", - srcs = ["src/Sphere_TEST.cc"], - deps = [ - ":Sphere", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "SphericalCoordinates", - srcs = ["src/SphericalCoordinates.cc"], - hdrs = ["include/gz/math/SphericalCoordinates.hh"], - includes = ["include"], - deps = [ - ":Angle", - ":Config", - ":CoordinateVector3", - ":Helpers", - ":Matrix3", - ":Vector3", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "SphericalCoordinates_TEST", - srcs = ["src/SphericalCoordinates_TEST.cc"], - deps = [ - ":SphericalCoordinates", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Spline", - srcs = [ - "src/Spline.cc", - "src/SplinePrivate.cc", - "src/SplinePrivate.hh", - ], - hdrs = ["include/gz/math/Spline.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Matrix4", - ":Vector3", - ":Vector4", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "Spline_TEST", - srcs = ["src/Spline_TEST.cc"], - deps = [ - ":Spline", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Stopwatch", - srcs = [ - "src/Stopwatch.cc", - ], - hdrs = ["include/gz/math/Stopwatch.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Export", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "Stopwatch_TEST", - srcs = ["src/Stopwatch_TEST.cc"], - deps = [ - ":Stopwatch", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Temperature", - srcs = [ - "src/Temperature.cc", - ], - hdrs = ["include/gz/math/Temperature.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Export", - ":Helpers", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "Temperature_TEST", - srcs = ["src/Temperature_TEST.cc"], - deps = [ - ":Temperature", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "TimeVaryingVolumetricGrid", - hdrs = ["include/gz/math/TimeVaryingVolumetricGrid.hh"], - includes = ["include"], - deps = [ - ":TimeVaryingVolumetricGridLookupField", - ":Vector3", - ], -) - -cc_test( - name = "TimeVaryingVolumetricGrid_TEST", - srcs = ["src/TimeVaryingVolumetricGrid_TEST.cc"], - deps = [ - ":TimeVaryingVolumetricGrid", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "TimeVaryingVolumetricGridLookupField", - hdrs = ["include/gz/math/TimeVaryingVolumetricGridLookupField.hh"], - includes = ["include"], - deps = [ - ":InterpolationPoint", - ":VolumetricGridLookupField", - ], -) - -cc_test( - name = "TimeVaryingVolumetricGridLookupField_TEST", - srcs = ["src/TimeVaryingVolumetricGridLookupField_TEST.cc"], - deps = [ - ":TimeVaryingVolumetricGridLookupField", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Triangle", - hdrs = ["include/gz/math/Triangle.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Line2", - ":Vector2", - ], -) - -cc_test( - name = "Triangle_TEST", - srcs = ["src/Triangle_TEST.cc"], - deps = [ - ":Helpers", - ":Triangle", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Triangle3", - hdrs = ["include/gz/math/Triangle3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Line3", - ":Plane", - ":Vector3", - ], -) - -cc_test( - name = "Triangle3_TEST", - srcs = ["src/Triangle3_TEST.cc"], - deps = [ - ":Helpers", - ":Triangle3", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Vector2", - hdrs = ["include/gz/math/Vector2.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ], -) - -cc_test( - name = "Vector2_TEST", - srcs = ["src/Vector2_TEST.cc"], - deps = [ - ":Helpers", - ":Vector2", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Vector3", - hdrs = ["include/gz/math/Vector3.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ], -) - -cc_test( - name = "Vector3_TEST", - srcs = ["src/Vector3_TEST.cc"], - deps = [ - ":Config", - ":Helpers", - ":Vector3", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Vector3Stats", - srcs = ["src/Vector3Stats.cc"], - hdrs = ["include/gz/math/Vector3Stats.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":SignalStats", - ":Vector3", - "@gz-utils//:ImplPtr", - ], -) - -cc_test( - name = "Vector3Stats_TEST", - srcs = ["src/Vector3Stats_TEST.cc"], - deps = [ - ":Vector3Stats", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "Vector4", - hdrs = ["include/gz/math/Vector4.hh"], - includes = ["include"], - deps = [ - ":Config", - ":Helpers", - ":Matrix4", - ], -) - -cc_test( - name = "Vector4_TEST", - srcs = ["src/Vector4_TEST.cc"], - deps = [ - ":Helpers", - ":Matrix4", - ":Vector4", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "VolumetricGridLookupField", - hdrs = ["include/gz/math/VolumetricGridLookupField.hh"], - includes = ["include"], - deps = [ - ":InterpolationPoint", - ":Vector3", - ], -) - -cc_test( - name = "VolumetricGridLookupField_TEST", - srcs = ["src/VolumetricGridLookupField_TEST.cc"], - deps = [ - ":VolumetricGridLookupField", - "@googletest//:gtest", - "@googletest//:gtest_main", - ], -) +[ + cc_test( + name = src.replace("/", "_").replace(".cc", "").replace("src_", ""), + srcs = [src], + deps = [ + ":math", + "@googletest//:gtest", + "@googletest//:gtest_main", + ], + ) + for src in test_sources +] buildifier( name = "buildifier.fix", diff --git a/eigen3/BUILD.bazel b/eigen3/BUILD.bazel index 2ef9ee3e..840aaabb 100644 --- a/eigen3/BUILD.bazel +++ b/eigen3/BUILD.bazel @@ -13,53 +13,52 @@ license( package_name = "gz-math-eigen3", ) -cc_library( - name = "Conversions", - hdrs = ["include/gz/math/eigen3/Conversions.hh"], - includes = ["include"], - deps = [ - "//:AxisAlignedBox", - "//:Matrix3", - "//:Matrix6", - "//:Pose3", - "//:Quaternion", - "//:Vector3", - "@eigen", +public_headers = glob( + include = [ + "include/gz/math/eigen3/*.hh", ], ) -cc_test( - name = "Conversions_TEST", - srcs = ["src/Conversions_TEST.cc"], - deps = [ - ":Conversions", - "@googletest//:gtest", - "@googletest//:gtest_main", +private_headers = glob( + include = ["src/*.hh"], +) + +sources = glob( + include = [ + "src/*.cc", + ], + exclude = [ + "src/*_TEST.cc", ], ) cc_library( - name = "Util", - hdrs = ["include/gz/math/eigen3/Util.hh"], + name = "eigen3", + srcs = sources + private_headers, + hdrs = public_headers, includes = ["include"], + visibility = ["//visibility:public"], deps = [ - ":Conversions", - "//:AxisAlignedBox", - "//:Matrix3", - "//:OrientedBox", - "//:Pose3", - "//:Quaternion", - "//:Vector3", + "//:math", "@eigen", ], ) -cc_test( - name = "Util_TEST", - srcs = ["src/Util_TEST.cc"], - deps = [ - ":Util", - "@googletest//:gtest", - "@googletest//:gtest_main", +test_sources = glob( + include = [ + "src/*_TEST.cc", ], ) + +[ + cc_test( + name = src.replace("/", "_").replace(".cc", "").replace("src_", ""), + srcs = [src], + deps = [ + ":eigen3", + "@googletest//:gtest", + "@googletest//:gtest_main", + ], + ) + for src in test_sources +] diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index 90332a71..7cb6cc1a 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -9,154 +9,16 @@ license( package_name = "gz-math-examples", ) -cc_binary( - name = "additively_separable_scalar_field3", - srcs = ["additively_separable_scalar_field3_example.cc"], - deps = [ - "//:AdditivelySeparableScalarField3", - "//:Polynomial3", - ], -) - -cc_binary( - name = "angle", - srcs = ["angle_example.cc"], - deps = [ - "//:Angle", - ], -) - -cc_binary( - name = "box", - srcs = ["box_example.cc"], - deps = [ - "//:Box", - ], -) - -cc_binary( - name = "color", - srcs = ["color_example.cc"], - deps = [ - "//:Color", - ], -) - -cc_binary( - name = "diff_drive", - srcs = ["diff_drive_odometry.cc"], - deps = [ - "//:DiffDriveOdometry", - ], -) - -cc_binary( - name = "gauss_markov_process", - srcs = ["gauss_markov_process_example.cc"], - deps = [ - "//:GaussMarkovProcess", - ], -) - -cc_binary( - name = "graph", - srcs = ["graph_example.cc"], - deps = ["//:Graph"], -) - -cc_binary( - name = "helpers", - srcs = ["helpers_example.cc"], - deps = [ - "//:Helpers", - "//:Quaternion", +example_sources = glob( + include = [ + "*_example.cc", ], ) -cc_binary( - name = "interval", - srcs = ["interval_example.cc"], - deps = ["//:Interval"], -) - -cc_binary( - name = "kmeans", - srcs = ["kmeans.cc"], - deps = ["//:Kmeans"], -) - -cc_binary( - name = "matrix3", - srcs = ["matrix3_example.cc"], - deps = ["//:Matrix3"], -) - -cc_binary( - name = "piecewise_scalar_field3", - srcs = ["piecewise_scalar_field3_example.cc"], +[cc_binary( + name = src.replace(".cc", ""), + srcs = [src], deps = [ - "//:AdditivelySeparableScalarField3", - "//:PiecewiseScalarField3", - "//:Polynomial3", + "//:math", ], -) - -cc_binary( - name = "polynomial3", - srcs = ["polynomial3_example.cc"], - deps = ["//:Polynomial3"], -) - -cc_binary( - name = "pose3", - srcs = ["pose3_example.cc"], - deps = ["//:Pose3"], -) - -cc_binary( - name = "quaternion", - srcs = ["quaternion_example.cc"], - deps = ["//:Quaternion"], -) - -cc_binary( - name = "quaternion_from_euler", - srcs = ["quaternion_from_euler.cc"], - deps = ["//:Quaternion"], -) - -cc_binary( - name = "quaternion_to_euler", - srcs = ["quaternion_to_euler.cc"], - deps = ["//:Quaternion"], -) - -cc_binary( - name = "rand", - srcs = ["rand_example.cc"], - deps = ["//:Rand"], -) - -cc_binary( - name = "region3", - srcs = ["region3_example.cc"], - deps = ["//:Region3"], -) - -cc_binary( - name = "temperature", - srcs = ["temperature_example.cc"], - deps = ["//:Temperature"], -) - -cc_binary( - name = "triangle", - srcs = ["triangle_example.cc"], - deps = ["//:Triangle"], -) - -cc_binary( - name = "vector2", - srcs = ["vector2_example.cc"], - deps = ["//:Vector2"], -) +) for src in example_sources] From 8923c292af0df335339a706f0b407c0493f82c34 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 10 Feb 2025 19:24:52 +0000 Subject: [PATCH 2/7] Remove empty glob Signed-off-by: Michael Carroll --- BUILD.bazel | 2 +- eigen3/BUILD.bazel | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index a5ca9571..d707a2b4 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -67,7 +67,7 @@ sources = glob( ) cc_library( - name = "math", + name = "gz-math", srcs = sources, hdrs = public_headers + private_headers, includes = [ diff --git a/eigen3/BUILD.bazel b/eigen3/BUILD.bazel index 840aaabb..575b3268 100644 --- a/eigen3/BUILD.bazel +++ b/eigen3/BUILD.bazel @@ -19,10 +19,6 @@ public_headers = glob( ], ) -private_headers = glob( - include = ["src/*.hh"], -) - sources = glob( include = [ "src/*.cc", @@ -34,7 +30,7 @@ sources = glob( cc_library( name = "eigen3", - srcs = sources + private_headers, + srcs = sources, hdrs = public_headers, includes = ["include"], visibility = ["//visibility:public"], From ffda1075e38c62fd4b51000460614e0a8ed1f306 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 10 Feb 2025 19:35:48 +0000 Subject: [PATCH 3/7] Change math -> gz-math Signed-off-by: Michael Carroll --- BUILD.bazel | 2 +- eigen3/BUILD.bazel | 2 +- examples/BUILD.bazel | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index d707a2b4..b4d60428 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -91,7 +91,7 @@ test_sources = glob( name = src.replace("/", "_").replace(".cc", "").replace("src_", ""), srcs = [src], deps = [ - ":math", + ":gz-math", "@googletest//:gtest", "@googletest//:gtest_main", ], diff --git a/eigen3/BUILD.bazel b/eigen3/BUILD.bazel index 575b3268..d99a85b4 100644 --- a/eigen3/BUILD.bazel +++ b/eigen3/BUILD.bazel @@ -35,7 +35,7 @@ cc_library( includes = ["include"], visibility = ["//visibility:public"], deps = [ - "//:math", + "//:gz-math", "@eigen", ], ) diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index 7cb6cc1a..0ef05cff 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -19,6 +19,6 @@ example_sources = glob( name = src.replace(".cc", ""), srcs = [src], deps = [ - "//:math", + "//:gz-math", ], ) for src in example_sources] From ea7abcf8327b63de4e68915a4fcb1dc51e3a02c6 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 10 Feb 2025 19:47:02 +0000 Subject: [PATCH 4/7] Remove empty globs Signed-off-by: Michael Carroll --- BUILD.bazel | 1 - eigen3/BUILD.bazel | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index b4d60428..51192d8d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -59,7 +59,6 @@ private_headers = glob( sources = glob( include = [ "src/*.cc", - "src/bazel/*.cc", ], exclude = [ "src/*_TEST.cc", diff --git a/eigen3/BUILD.bazel b/eigen3/BUILD.bazel index d99a85b4..8f34d3d1 100644 --- a/eigen3/BUILD.bazel +++ b/eigen3/BUILD.bazel @@ -19,18 +19,8 @@ public_headers = glob( ], ) -sources = glob( - include = [ - "src/*.cc", - ], - exclude = [ - "src/*_TEST.cc", - ], -) - cc_library( name = "eigen3", - srcs = sources, hdrs = public_headers, includes = ["include"], visibility = ["//visibility:public"], From 75dd629cc2ec9b25cfae194f409b10302be33483 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 10 Feb 2025 20:23:06 +0000 Subject: [PATCH 5/7] Remove extra header Signed-off-by: Michael Carroll --- BUILD.bazel | 3 --- 1 file changed, 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 51192d8d..2f858bd2 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -42,9 +42,6 @@ public_headers = glob( "include/gz/math/detail/*.hh", "include/gz/math/graph/*.hh", ], - exclude = [ - "include/gz/math/sdf.hh", - ], ) + [ "include/gz/math/Export.hh", "include/gz/math/config.hh", From 18dee5596768c7c20ae23d3133b52884d649cf1b Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Mon, 10 Feb 2025 20:30:03 +0000 Subject: [PATCH 6/7] Change example glob Signed-off-by: Michael Carroll --- examples/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel index 0ef05cff..32c57ee7 100644 --- a/examples/BUILD.bazel +++ b/examples/BUILD.bazel @@ -11,7 +11,7 @@ license( example_sources = glob( include = [ - "*_example.cc", + "*.cc", ], ) From b53312f9d83cd01f113979ca12bebcfac9194933 Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Tue, 11 Feb 2025 00:33:28 +0000 Subject: [PATCH 7/7] Move private_headers Signed-off-by: Michael Carroll --- BUILD.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 2f858bd2..e5993fd0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -64,8 +64,8 @@ sources = glob( cc_library( name = "gz-math", - srcs = sources, - hdrs = public_headers + private_headers, + srcs = sources + private_headers, + hdrs = public_headers, includes = [ "include", ],