Bazel layering check fixes with clang (#684)

Signed-off-by: Shameek Ganguly <[email protected]>

Author: shameekganguly

BUILD.bazel

@@ -73,10 +73,13 @@ cc_library(
     includes = ["include"],
     visibility = ["//visibility:public"],
     deps = [
+        "@gz-math",
         "@gz-utils//:ImplPtr",
+        "@gz-utils//:NeverDestroyed",
+        "@gz-utils//:SuppressWarning",
         "@gz-utils//log:Logger",
-        "@gz-math//:gz-math",
         "@libuuid",
+        "@spdlog",
     ],
 )
 
@@ -94,9 +97,10 @@ test_sources = glob(
     copts = ["-fexceptions"],
     deps = [
         ":gz-common",
-        "//testing:testing",
+        "//testing",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
+        "@gz-math",
         "@gz-utils//:ExtraTestMacros",
     ],
 ) for src in test_sources]

MODULE.bazel

@@ -12,6 +12,7 @@ bazel_dep(name = "freeimage", version = "3.19.10")
 bazel_dep(name = "googletest", version = "1.14.0")
 bazel_dep(name = "remotery", version = "1.0.0")
 bazel_dep(name = "rules_license", version = "1.0.0")
+bazel_dep(name = "spdlog", version = "1.12.0")
 bazel_dep(name = "tinyxml2", version = "10.0.0")
 bazel_dep(name = "libuuid", version = "2.39.3.bcr.1")
 

events/BUILD.bazel

@@ -41,7 +41,9 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//:gz-common",
+        "@gz-math",
         "@gz-utils//:ImplPtr",
+        "@gz-utils//:SuppressWarning",
     ],
 )
 
@@ -50,8 +52,9 @@ cc_library(
     srcs = [src],
     deps = [
         ":events",
-        "//testing:testing",
-        "@googletest//:gtest_main",
+        "//:gz-common",
+        "//testing",
         "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 ) for src in test_sources]

geospatial/BUILD.bazel

@@ -20,14 +20,14 @@ sources = glob(
     exclude = [
         "src/*_TEST.cc",
         # \todo(iche033) include Dem.cc once gdal dep is available.
-        "src/Dem.cc"
+        "src/Dem.cc",
     ],
 )
 
 test_sources = glob(
     include = ["src/*_TEST.cc"],
     # \todo(iche033) include this test once gdal dep is available.
-    exclude = ["src/Dem_TEST.cc"]
+    exclude = ["src/Dem_TEST.cc"],
 )
 
 gz_export_header(
@@ -49,36 +49,37 @@ cc_library(
         "-Wno-unused-value",
         "-fexceptions",
     ],
+    # \todo(iche033) remove this macro once gdal dep is available.
+    defines = [
+        "BAZEL_DISABLE_DEM_LOADER=1",
+    ],
     includes = ["include"],
     visibility = ["//visibility:public"],
     deps = [
         "//:gz-common",
-        "//graphics:graphics",
+        "//graphics",
         "@gz-utils//:ImplPtr",
+        "@gz-math",
         # \todo(iche033) gdal is not in BCR yet
         # "@gdal",
     ],
-    # \todo(iche033) remove this macro once gdal dep is available.
-    defines = [
-        "BAZEL_DISABLE_DEM_LOADER=1"
-    ]
 )
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
     data = ["//test:data"],
+    # \todo(iche033) remove this macro once gdal dep is available.
+    defines = [
+        "BAZEL_DISABLE_DEM_LOADER=1",
+    ],
     env = {
         "GZ_BAZEL": "1",
     },
     deps = [
         ":geospatial",
-        "//testing:testing",
+        "//testing",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
-    # \todo(iche033) remove this macro once gdal dep is available.
-    defines = [
-        "BAZEL_DISABLE_DEM_LOADER=1"
-    ]
 ) for src in test_sources]

graphics/BUILD.bazel

@@ -14,6 +14,7 @@ public_headers_no_gen = glob([
 ])
 
 vhacd_header = ["src/VHACD/VHACD.h"]
+
 tiny_obj_loader_header = ["src/tiny_obj_loader.h"]
 
 sources = glob(
@@ -48,7 +49,8 @@ cc_library(
         "//:gz-common",
         "@assimp",
         "@cdt",
-        "@freeimage//:freeimage",
+        "@freeimage",
+        "@gz-math",
         "@gz-utils//:ImplPtr",
         "@tinyxml2",
     ],
@@ -63,8 +65,11 @@ cc_library(
     },
     deps = [
         ":graphics",
-        "//testing:testing",
+        "//:gz-common",
+        "//testing",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
+        "@gz-math",
+        "@tinyxml2",
     ],
 ) for src in test_sources]

io/BUILD.bazel

@@ -42,6 +42,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//:gz-common",
+        "@gz-math",
         "@gz-utils//:ImplPtr",
     ],
 )
@@ -54,10 +55,10 @@ cc_library(
     },
     deps = [
         ":io",
-        "//testing:testing",
+        "//:gz-common",
+        "//testing",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
-
+        "@gz-math",
     ],
 ) for src in test_sources]
-

profiler/BUILD.bazel

@@ -61,6 +61,7 @@ cc_library(
     ],
     includes = ["include"],
     deps = [
+        ":Export",
         ":ProfilerImplInterface",
         "//:gz-common",
         "@remotery",
@@ -155,6 +156,7 @@ cc_test(
     }),
     deps = [
         ":profiler",
+        "//:gz-common",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -170,6 +172,7 @@ cc_test(
     }),
     deps = [
         ":profiler",
+        "//:gz-common",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -184,7 +187,9 @@ cc_test(
         "//conditions:default": ["BAZEL_SKIP_PROFILER_TEST=1"],
     }),
     deps = [
+        ":ProfilerImplInterface",
         ":profiler",
+        "//:gz-common",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -196,6 +201,7 @@ cc_test(
     deps = [
         ":RemoteryProfilerImpl",
         ":profiler",
+        "//:gz-common",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
         "@remotery",

test/BUILD.bazel

@@ -14,7 +14,8 @@ cc_test(
     },
     deps = [
         "//:gz-common",
-        "//testing:testing",
+        "//testing",
+        "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
 )
@@ -34,11 +35,11 @@ cc_test(
     },
     deps = [
         "//:gz-common",
-        "//testing:testing",
-        "//graphics:graphics",
-        "@gz-math//:gz-math",
+        "//graphics",
+        "//testing",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
+        "@gz-math//:gz-math",
     ],
 )
 

testing/BUILD.bazel

@@ -19,9 +19,10 @@ public_headers = glob(
     include = [
         "include/gz/common/testing/*.hh",
         "include/gz/common/testing/detail/*.hh",
-    ]) + [
-        "include/gz/common/testing/Export.hh"
-    ]
+    ],
+) + [
+    "include/gz/common/testing/Export.hh",
+]
 
 cc_library(
     name = "testing",
@@ -37,6 +38,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//:gz-common",
+        "@gz-utils//:ImplPtr",
+        "@gz-utils//:SuppressWarning",
     ],
 )
 
@@ -45,6 +48,7 @@ cc_test(
     srcs = ["src/AutoLogFixture_TEST.cc"],
     deps = [
         ":testing",
+        "//:gz-common",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -59,6 +63,7 @@ cc_test(
     },
     deps = [
         ":testing",
+        "//:gz-common",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],