summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--elite-robots-msgs.spec3
1 files changed, 2 insertions, 1 deletions
diff --git a/elite-robots-msgs.spec b/elite-robots-msgs.spec
index 469485e..715757e 100644
--- a/elite-robots-msgs.spec
+++ b/elite-robots-msgs.spec
@@ -150,10 +150,11 @@ export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$
# ament 通过 AMENT_PREFIX_PATH 环境变量查找已安装包,把 buildroot 前置以找到本 spec 内前序子包
export AMENT_PREFIX_PATH=%{buildroot}/opt/ros/%{ros_distro}:/opt/ros/%{ros_distro}
-# 公共 cmake 参数(CMAKE_PREFIX_PATH 保持与 AMENT_PREFIX_PATH 一致)
+# 公共 cmake 参数(CMAKE_PREFIX_PATH 和 AMENT_PREFIX_PATH 均需传入,确保 ament find_package 可找到 buildroot 内的前序子包)
CMAKE_COMMON_ARGS="\
-DCMAKE_INSTALL_PREFIX=/opt/ros/%{ros_distro} \
-DCMAKE_PREFIX_PATH=%{buildroot}/opt/ros/%{ros_distro}:/opt/ros/%{ros_distro} \
+ -DAMENT_PREFIX_PATH=%{buildroot}/opt/ros/%{ros_distro}:/opt/ros/%{ros_distro} \
-UINCLUDE_INSTALL_DIR -ULIB_INSTALL_DIR -USYSCONF_INSTALL_DIR -USHARE_INSTALL_PREFIX -ULIB_SUFFIX \
-DSETUPTOOLS_DEB_LAYOUT=OFF \
-DBUILD_TESTING=OFF -DTESTING=OFF -DCMAKE_SUPPRESS_REGENERATION=ON"