From c0409b937d1875405eeb3d7074ff5d21d70b9c95 Mon Sep 17 00:00:00 2001 From: xavisolesoft Date: Tue, 19 Mar 2024 10:25:44 +0000 Subject: [PATCH] ROS2: Force foonathan memory vendor lib to build even ROS2 is installed on the system --- Util/BuildTools/Setup.bat | 1 + Util/BuildTools/Setup.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Util/BuildTools/Setup.bat b/Util/BuildTools/Setup.bat index 99dd8bb82..5a496a966 100644 --- a/Util/BuildTools/Setup.bat +++ b/Util/BuildTools/Setup.bat @@ -320,6 +320,7 @@ IF "%USE_ROS2%"=="true" ( -DCMAKE_INSTALL_PREFIX="%FASTDDS_INSTALL_DIR%" ^ -DBUILD_SHARED_LIBS=ON ^ -DCMAKE_CXX_FLAGS_RELEASE="-D_GLIBCXX_USE_CXX11_ABI=0" ^ + -DFOONATHAN_MEMORY_FORCE_VENDORED_BUILD=ON ^ .. ninja ninja install diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh index 81a416d07..21e8204fb 100755 --- a/Util/BuildTools/Setup.sh +++ b/Util/BuildTools/Setup.sh @@ -926,6 +926,7 @@ if ${USE_ROS2} ; then -DCMAKE_INSTALL_PREFIX="${FASTDDS_INSTALL_DIR}" \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_CXX_FLAGS_RELEASE="-D_GLIBCXX_USE_CXX11_ABI=0" \ + -DFOONATHAN_MEMORY_FORCE_VENDORED_BUILD=ON \ .. ninja ninja install