[cmake] Move cmake_util to a better home and filename (#18026)

RobotLocomotion · Oct 3, 2022 · c268016 · c268016
1 parent 0d4979d
commit c268016
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -89,8 +89,11 @@ install_test(
 )
 
 add_lint_tests(
-    bazel_lint_extra_srcs = [
-        "cmake/external/workspace/spdlog/BUILD.bazel.in",
-        "cmake/external/workspace/fmt/BUILD.bazel.in",
-    ],
+    bazel_lint_extra_srcs = glob(
+        [
+            "cmake/external/workspace/**/*.bazel.in",
+            "cmake/external/workspace/**/*.bzl",
+        ],
+        allow_empty = False,
+    ),
 )
diff --git a/tools/workspace/cmake_util.bzl → cmake/external/workspace/conversion.bzl b/tools/workspace/cmake_util.bzl → cmake/external/workspace/conversion.bzl
diff --git a/cmake/external/workspace/eigen/BUILD.bazel.in b/cmake/external/workspace/eigen/BUILD.bazel.in
@@ -1,7 +1,7 @@
 # -*- python -*-
 
 load("@drake//tools/install:install.bzl", "install")
-load("@drake//tools/workspace:cmake_util.bzl", "split_cmake_list")
+load("@drake//:cmake/external/workspace/conversion.bzl", "split_cmake_list")
 
 EIGEN_DEFINES = split_cmake_list(
     "$<TARGET_PROPERTY:Eigen3::Eigen,INTERFACE_COMPILE_DEFINITIONS>",

diff --git a/cmake/external/workspace/fmt/BUILD.bazel.in b/cmake/external/workspace/fmt/BUILD.bazel.in
@@ -2,7 +2,7 @@
 
 load("@drake//tools/install:install.bzl", "install")
 load(
-    "@drake//tools/workspace:cmake_util.bzl",
+    "@drake//:cmake/external/workspace/conversion.bzl",
     "library_to_linkopts",
     "split_cmake_list",
 )

diff --git a/cmake/external/workspace/spdlog/BUILD.bazel.in b/cmake/external/workspace/spdlog/BUILD.bazel.in
@@ -2,7 +2,7 @@
 
 load("@drake//tools/install:install.bzl", "install")
 load(
-    "@drake//tools/workspace:cmake_util.bzl",
+    "@drake//:cmake/external/workspace/conversion.bzl",
     "library_to_linkopts",
     "split_cmake_list",
 )