Merge pull request #167 from ssnover/fix/package-discovery-with-ros-p…

…ackage-path Add environment variable ROS_PACKAGE_PATH to paths searched for messages
adnanademovic · Aug 29, 2022 · 0cc8bbc · 0cc8bbc
2 parents 9e1b0c9 + 2420334
commit 0cc8bbc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/rosrust_codegen/src/rosmsg_include.rs b/rosrust_codegen/src/rosmsg_include.rs
@@ -19,6 +19,11 @@ pub fn depend_on_messages(
         .split(':')
         .filter_map(append_src_folder)
         .collect::<Vec<String>>();
+    let ros_package_paths = env::var("ROS_PACKAGE_PATH")
+        .unwrap_or_default()
+        .split(':')
+        .map(String::from)
+        .collect::<Vec<String>>();
     let extra_paths = env::var("ROSRUST_MSG_PATH")
         .unwrap_or_default()
         .split(':')
@@ -27,6 +32,7 @@ pub fn depend_on_messages(
     let paths = cmake_paths
         .iter()
         .chain(cmake_alt_paths.iter())
+        .chain(ros_package_paths.iter())
         .chain(extra_paths.iter())
         .map(String::as_str)
         .collect::<Vec<&str>>();

diff --git a/rosrust_msg/build.rs b/rosrust_msg/build.rs
@@ -7,6 +7,7 @@ fn main() {
 
     rerun_if_env_changed("OUT_DIR");
     rerun_if_env_changed("CMAKE_PREFIX_PATH");
+    rerun_if_env_changed("ROS_PACKAGE_PATH");
     rerun_if_env_changed("ROSRUST_MSG_PATH");
 
     let cmake_paths = env::var("CMAKE_PREFIX_PATH")
@@ -19,6 +20,11 @@ fn main() {
         .split(':')
         .filter_map(append_src_folder)
         .collect::<Vec<String>>();
+    let ros_package_paths = env::var("ROS_PACKAGE_PATH")
+        .unwrap_or_default()
+        .split(':')
+        .map(String::from)
+        .collect::<Vec<String>>();
     let extra_paths = env::var("ROSRUST_MSG_PATH")
         .unwrap_or_default()
         .split(':')
@@ -27,6 +33,7 @@ fn main() {
     let paths = cmake_paths
         .iter()
         .chain(cmake_alt_paths.iter())
+        .chain(ros_package_paths.iter())
         .chain(extra_paths.iter())
         .collect::<Vec<_>>();
     for path in &paths {