From 25d8bdbe7492748e43665527e41b98fd73b819f1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 10 Jan 2025 14:10:36 +0100 Subject: [PATCH 1/2] Fix ROS 2 build when ZeroMQ or SQlite3 include are not in the default include path --- cmake/ament_build.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/ament_build.cmake b/cmake/ament_build.cmake index 55c3011b2..152268032 100644 --- a/cmake/ament_build.cmake +++ b/cmake/ament_build.cmake @@ -10,7 +10,10 @@ if(BTCPP_SQLITE_LOGGING) find_package(SQLite3 REQUIRED) endif() -find_package(ament_index_cpp REQUIRED) +find_package(ament_index_cpp REQUIRED + +set(BTCPP_EXTRA_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIRS} + ${SQLite3_INCLUDE_DIRS}) set( BTCPP_EXTRA_LIBRARIES $ @@ -26,6 +29,7 @@ set( BTCPP_BIN_DESTINATION bin ) mark_as_advanced( BTCPP_EXTRA_LIBRARIES + BTCPP_EXTRA_INCLUDE_DIRS BTCPP_LIB_DESTINATION BTCPP_INCLUDE_DESTINATION BTCPP_BIN_DESTINATION ) From 5309dd6cbf00e17ca807b31b631e995c218141c1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 31 Jan 2025 17:13:46 +0100 Subject: [PATCH 2/2] Update ament_build.cmake --- cmake/ament_build.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ament_build.cmake b/cmake/ament_build.cmake index 152268032..ec1e0a66b 100644 --- a/cmake/ament_build.cmake +++ b/cmake/ament_build.cmake @@ -10,7 +10,7 @@ if(BTCPP_SQLITE_LOGGING) find_package(SQLite3 REQUIRED) endif() -find_package(ament_index_cpp REQUIRED +find_package(ament_index_cpp REQUIRED) set(BTCPP_EXTRA_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIRS} ${SQLite3_INCLUDE_DIRS})