From 81253e15a0f1f447292efb0d5545a00c3511e91e Mon Sep 17 00:00:00 2001 From: libjared <4498312-libjared@users.noreply.gitlab.com> Date: Mon, 30 Oct 2023 05:50:44 +0000 Subject: [PATCH] feat: build OpenComposite as debug, too, if specified --- src/builders/build_opencomposite.rs | 11 +++++++++-- src/ui/app.rs | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/builders/build_opencomposite.rs b/src/builders/build_opencomposite.rs index c75963f..a5b61b0 100644 --- a/src/builders/build_opencomposite.rs +++ b/src/builders/build_opencomposite.rs @@ -9,7 +9,11 @@ use std::{ path::Path, }; -pub fn get_build_opencomposite_jobs(profile: &Profile, clean_build: bool) -> VecDeque { +pub fn get_build_opencomposite_jobs( + profile: &Profile, + clean_build: bool, + debug_build: bool, +) -> VecDeque { let mut jobs = VecDeque::::new(); let git = Git { @@ -25,7 +29,10 @@ pub fn get_build_opencomposite_jobs(profile: &Profile, clean_build: bool) -> Vec let build_dir = format!("{}/build", profile.opencomposite_path); let mut cmake_vars: HashMap = HashMap::new(); - cmake_vars.insert("CMAKE_BUILD_TYPE".into(), "Release".into()); + cmake_vars.insert( + "CMAKE_BUILD_TYPE".into(), + (if debug_build { "Debug" } else { "Release" }).into(), + ); let cmake = Cmake { env: None, vars: Some(cmake_vars), diff --git a/src/ui/app.rs b/src/ui/app.rs index 46c33cc..84f234b 100644 --- a/src/ui/app.rs +++ b/src/ui/app.rs @@ -462,7 +462,11 @@ impl SimpleComponent for App { }); // no listed deps for opencomp } - jobs.extend(get_build_opencomposite_jobs(&profile, clean_build)); + jobs.extend(get_build_opencomposite_jobs( + &profile, + clean_build, + debug_build, + )); if !missing_deps.is_empty() { missing_deps.sort_unstable(); missing_deps.dedup(); // dedup only works if sorted, hence the above