Skip to content

Fix include directory parsing on Linux in some cases #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-dahl merged 1 commit into from
Dec 10, 2023
Merged

Fix include directory parsing on Linux in some cases #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions r2r_common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ pub fn setup_bindgen_builder() -> bindgen::Builder {
}

let ament_prefix_var_name = "AMENT_PREFIX_PATH";
let split_char = if cfg!(target_os = "windows") {
';'
} 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(";");
ament_str.push(&split_char.to_string());
ament_str.push(cmake_prefix_var);
}
RawOsString::new(ament_str)
};
let split_char = if cfg!(target_os = "windows") {
';'
} else {
':'
};
for p in ament_prefix_var.split(split_char) {
let path = Path::new(&p.to_os_str()).join("include");

Expand Down