diff --git a/Cargo.lock b/Cargo.lock index a0e9fd5..1041557 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2499,7 +2499,7 @@ dependencies = [ [[package]] name = "qpm_package" version = "0.4.0" -source = "git+https://github.com/QuestPackageManager/QPM.Package.git#f0279176bc071629f8c7790f0d7bea32ea680ddd" +source = "git+https://github.com/QuestPackageManager/QPM.Package.git#d60c34addefc4879d87ba651fc5cad866a78ac63" dependencies = [ "cursed-semver-parser", "semver", diff --git a/src/models/toolchain.rs b/src/models/toolchain.rs index 862cf0b..3447bf5 100644 --- a/src/models/toolchain.rs +++ b/src/models/toolchain.rs @@ -70,6 +70,7 @@ pub fn write_toolchain_file( .into_iter() .chain(x.system_includes.unwrap_or_default()) .collect(); + let cpp_features: Vec = acc .cpp_features .unwrap_or_default() diff --git a/src/utils/cmake.rs b/src/utils/cmake.rs index 741cd39..ff9dbb2 100644 --- a/src/utils/cmake.rs +++ b/src/utils/cmake.rs @@ -216,6 +216,12 @@ pub fn write_extern_cmake(dep: &SharedPackageConfig, repo: &impl Repository) -> } } + if let Some(ref additional_include_dirs) = dep.config.workspace.additional_includes { + for dir in additional_include_dirs.iter() { + writeln!(result, "target_include_directories(${{COMPILE_ID}} PRIVATE ${{CMAKE_CURRENT_SOURCE_DIR}}/{dir})")?; + } + } + if !any { result.push_str("# Sadly, there were none with extra include dirs\n"); }