From a5d3f8320655d7ca91b31ef4d3325e035a6387ee Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 6 Sep 2024 13:44:46 +0000 Subject: [PATCH 1/2] Add in a dependency on spdlog_vendor. That way when building on e.g. Windows, the paths to spdlog will be setup properly before trying to build this vendor package. Signed-off-by: Chris Lalancette --- CMakeLists.txt | 1 + package.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4286745..9196e3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ find_package(ament_cmake_vendor_package REQUIRED) find_package(ament_cmake_export_dependencies REQUIRED) find_package(gz_cmake_vendor REQUIRED) +find_package(spdlog_vendor REQUIRED) # Set the VERSION_MATCH to "EXACT" by default, but relax the requirement # if we are users are building from source (determined by the diff --git a/package.xml b/package.xml index 81050e0..ba437bb 100644 --- a/package.xml +++ b/package.xml @@ -26,6 +26,8 @@ spdlog spdlog + spdlog_vendor + spdlog_vendor gz_cmake_vendor From 995cf261db429283d14111788056736304c6c29d Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 6 Sep 2024 18:41:57 +0000 Subject: [PATCH 2/2] Also remove the spdlog dependency. That's because we will just depend on the vendor package to provide that dependency for us as necessary. Signed-off-by: Chris Lalancette --- package.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.xml b/package.xml index ba437bb..c83a168 100644 --- a/package.xml +++ b/package.xml @@ -24,8 +24,6 @@ ament_cmake_test ament_cmake_vendor_package - spdlog - spdlog spdlog_vendor spdlog_vendor gz_cmake_vendor