From 54cd64a2603e55cfa662ac9685683209e7a43d66 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sat, 29 Jun 2024 22:04:28 +0200 Subject: [PATCH] Change `asio` BUILD to be compatible with the BCR version --- repositories/asio.BUILD.bazel | 13 ++++--------- repositories/foxglove_bridge.BUILD.bazel | 1 + repositories/repositories.bzl | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/repositories/asio.BUILD.bazel b/repositories/asio.BUILD.bazel index 3d72fb60..9e273d70 100644 --- a/repositories/asio.BUILD.bazel +++ b/repositories/asio.BUILD.bazel @@ -5,15 +5,10 @@ load("@rules_cc//cc:defs.bzl", "cc_library") cc_library( name = "asio", - srcs = glob(["src/*.cpp"]), - hdrs = glob([ - "include/**/*.hpp", - "include/**/*.ipp", + srcs = glob([ + "**/*.hpp", + "**/*.ipp", ]), - defines = [ - "ASIO_SEPARATE_COMPILATION", - ], - includes = ["include"], + includes = ["."], visibility = ["//visibility:public"], - deps = ["@boringssl//:ssl"], ) diff --git a/repositories/foxglove_bridge.BUILD.bazel b/repositories/foxglove_bridge.BUILD.bazel index cf20f3e2..ca9face1 100644 --- a/repositories/foxglove_bridge.BUILD.bazel +++ b/repositories/foxglove_bridge.BUILD.bazel @@ -25,6 +25,7 @@ cc_library( copts = ["-std=c++17"], includes = ["foxglove_bridge_base/include"], deps = [ + "@boringssl//:ssl", "@nlohmann_json//:json", "@websocketpp", ], diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl index 6af75971..c51aa1d4 100644 --- a/repositories/repositories.bzl +++ b/repositories/repositories.bzl @@ -129,9 +129,9 @@ def ros2_workspace_repositories(): http_archive, name = "asio", build_file = "@com_github_mvukov_rules_ros2//repositories:asio.BUILD.bazel", - sha256 = "b31c63867daaba0e460ee2c85dc508a52c81db0a7318e0d2147f444b26f80ed7", - strip_prefix = "asio-asio-1-27-0/asio", - urls = ["https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-27-0.tar.gz"], + sha256 = "5705a0e403017eba276625107160498518838064a6dd7fd8b00b2e30c0ffbdee", + strip_prefix = "asio-asio-1-28-2/asio/include", + urls = ["https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-28-2.tar.gz"], ) # We're pointing at hedronvision's mirror of google/boringssl:main-with-bazel to get