diff options
| author | Sam Freed <safreed@microsoft.com> | 2021-06-07 16:38:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-06-08 11:49:50 (GMT) |
| commit | de2b14a7117be203544f3014d2a0a9cac93f9a1e (patch) | |
| tree | 9afb355ca40aea4d1f93b39a419c337cffe17012 /Source/cmake.cxx | |
| parent | efe7ac9022b18132d33c68919c81422d738cd672 (diff) | |
| parent | 534c40e6d8801853c19435a8c2d732ca2b01b606 (diff) | |
| download | CMake-de2b14a7117be203544f3014d2a0a9cac93f9a1e.zip CMake-de2b14a7117be203544f3014d2a0a9cac93f9a1e.tar.gz CMake-de2b14a7117be203544f3014d2a0a9cac93f9a1e.tar.bz2 | |
Merge branch 'backport-3.20-presets-build-fixes' into presets-build-fixes
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 840a9d9..33455c3 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3263,7 +3263,9 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets, this->UnprocessedPresetEnvironment = expandedPreset->Environment; this->ProcessPresetEnvironment(); - if (jobs == cmake::DEFAULT_BUILD_PARALLEL_LEVEL && expandedPreset->Jobs) { + if ((jobs == cmake::DEFAULT_BUILD_PARALLEL_LEVEL || + jobs == cmake::NO_BUILD_PARALLEL_LEVEL) && + expandedPreset->Jobs) { jobs = *expandedPreset->Jobs; } |