diff options
| author | Carsten Rudolph <18394207+crud89@users.noreply.github.com> | 2022-01-21 16:43:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-01-22 11:35:38 (GMT) |
| commit | 193b8fca52b5665387dbc7f3199981d9e6cd4b79 (patch) | |
| tree | e3a5d14692f37645b9b7a03fc240dd0f25bace48 /Source/cmake.cxx | |
| parent | 6a1010349355354e27015a004f5620b77993b91c (diff) | |
| download | CMake-193b8fca52b5665387dbc7f3199981d9e6cd4b79.zip CMake-193b8fca52b5665387dbc7f3199981d9e6cd4b79.tar.gz CMake-193b8fca52b5665387dbc7f3199981d9e6cd4b79.tar.bz2 | |
cmBuildOptions: Split build arguments into separate object.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index c708eb2..2361ce2 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -28,6 +28,7 @@ #include "cm_sys_stat.h" +#include "cmBuildOptions.h" #include "cmCMakePath.h" #include "cmCMakePresetsGraph.h" #include "cmCommandLineArgument.h" @@ -3219,8 +3220,8 @@ std::vector<std::string> cmake::GetDebugConfigs() int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets, std::string config, std::vector<std::string> nativeOptions, - bool clean, bool verbose, const std::string& presetName, - bool listPresets) + cmBuildOptions& buildOptions, bool verbose, + const std::string& presetName, bool listPresets) { this->SetHomeDirectory(""); this->SetHomeOutputDirectory(""); @@ -3326,8 +3327,8 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets, config = expandedPreset->Configuration; } - if (!clean && expandedPreset->CleanFirst) { - clean = *expandedPreset->CleanFirst; + if (!buildOptions.Clean && expandedPreset->CleanFirst) { + buildOptions.Clean = *expandedPreset->CleanFirst; } if (!verbose && expandedPreset->Verbose) { @@ -3466,7 +3467,7 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets, this->GlobalGenerator->PrintBuildCommandAdvice(std::cerr, jobs); return this->GlobalGenerator->Build( - jobs, "", dir, projName, targets, output, "", config, clean, false, + jobs, "", dir, projName, targets, output, "", config, buildOptions, verbose, cmDuration::zero(), cmSystemTools::OUTPUT_PASSTHROUGH, nativeOptions); } |