summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ros2-medkit-linux-introspection.spec9
-rw-r--r--sources2
2 files changed, 10 insertions, 1 deletions
diff --git a/ros2-medkit-linux-introspection.spec b/ros2-medkit-linux-introspection.spec
index bbd60fb..b263679 100644
--- a/ros2-medkit-linux-introspection.spec
+++ b/ros2-medkit-linux-introspection.spec
@@ -49,6 +49,14 @@ This package provides discovery plugins that expose Linux system information
export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH}
export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+# 已安装的 ros2_medkit_cmake 包可能缺少 ROS2MedkitCoverage 等 cmake 模块文件;
+# 从源码树直接补装,确保 CMAKE_MODULE_PATH 能找到它们。
+_medkit_cmake_dir=/opt/ros/%{ros_distro}/share/ros2_medkit_cmake/cmake
+install -d "${_medkit_cmake_dir}"
+for _f in src/ros2_medkit_cmake/cmake/ROS2Medkit*.cmake; do
+ [ -f "${_medkit_cmake_dir}/$(basename ${_f})" ] || install -m 644 "${_f}" "${_medkit_cmake_dir}/"
+done
+
cd src/ros2_medkit_discovery_plugins/ros2_medkit_linux_introspection
mkdir -p .obj
cd .obj
@@ -56,6 +64,7 @@ cd .obj
-DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \
-DAMENT_PREFIX_PATH="/opt/ros/%{ros_distro}" \
-DCMAKE_PREFIX_PATH="/opt/ros/%{ros_distro}" \
+ -DCMAKE_MODULE_PATH="${_medkit_cmake_dir}" \
-UINCLUDE_INSTALL_DIR -ULIB_INSTALL_DIR -USYSCONF_INSTALL_DIR \
-USHARE_INSTALL_PREFIX -ULIB_SUFFIX \
-DSETUPTOOLS_DEB_LAYOUT=OFF \
diff --git a/sources b/sources
index a79d577..34f3dfe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79a543cb5aeefc155dc70edd98c1eb5a ros2_medkit-5fbdded41d49390830dbfbda745a3da924dd6ab2.tar.gz
+34a111cedb7a129336543694d7364e66 ros2_medkit-5fbdded41d49390830dbfbda745a3da924dd6ab2.tar.gz