mirror
/
r2r
mirror of https://github.com/sequenceplanner/r2r.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix include directory parsing on Linux in some cases

This commit is contained in:
Alec Rivers 2023-12-09 12:51:34 -08:00
parent 50b5f9da27
commit 9664d920ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
r2r_common/src/lib.rs
View File

@ -63,19 +63,19 @@ pub fn setup_bindgen_builder() -> bindgen::Builder {
} }
let ament_prefix_var_name = "AMENT_PREFIX_PATH"; let ament_prefix_var_name = "AMENT_PREFIX_PATH";
let ament_prefix_var = {
let mut ament_str = env::var_os(ament_prefix_var_name).expect("Source your ROS!");
if let Some(cmake_prefix_var) = env::var_os("CMAKE_PREFIX_PATH") {
ament_str.push(";");
ament_str.push(cmake_prefix_var);
}
RawOsString::new(ament_str)
};
let split_char = if cfg!(target_os = "windows") { let split_char = if cfg!(target_os = "windows") {
';' ';'
} else { } else {
':' ':'
}; };
let ament_prefix_var = {
let mut ament_str = env::var_os(ament_prefix_var_name).expect("Source your ROS!");
if let Some(cmake_prefix_var) = env::var_os("CMAKE_PREFIX_PATH") {
ament_str.push(&split_char.to_string());
ament_str.push(cmake_prefix_var);
}
RawOsString::new(ament_str)
};
for p in ament_prefix_var.split(split_char) { for p in ament_prefix_var.split(split_char) {
let path = Path::new(&p.to_os_str()).join("include"); let path = Path::new(&p.to_os_str()).join("include");