diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-28 11:32:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-28 11:32:58 (GMT) |
| commit | 6c107cf30354323005ea8776185fdd9458555dac (patch) | |
| tree | ba6325812a9f5db19037af0f79a6386abf3d799a /Source | |
| parent | 659c3fd23ce5455ed9f67b88db14d06274049d07 (diff) | |
| parent | f4c7d44d82dc568e659233934a1da2b8a7c42b25 (diff) | |
| download | CMake-6c107cf30354323005ea8776185fdd9458555dac.zip CMake-6c107cf30354323005ea8776185fdd9458555dac.tar.gz CMake-6c107cf30354323005ea8776185fdd9458555dac.tar.bz2 | |
Merge topic 'aix_makefile_build_jobs'
f4c7d44d82 Makefiles: Use -j option as "-jN" and not "-j N"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5431
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 2c934e1..c6c540b 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -590,9 +590,10 @@ cmGlobalUnixMakefileGenerator3::GenerateBuildCommand( makeCommand.Add(this->SelectMakeProgram(makeProgram)); if (jobs != cmake::NO_BUILD_PARALLEL_LEVEL) { - makeCommand.Add("-j"); - if (jobs != cmake::DEFAULT_BUILD_PARALLEL_LEVEL) { - makeCommand.Add(std::to_string(jobs)); + if (jobs == cmake::DEFAULT_BUILD_PARALLEL_LEVEL) { + makeCommand.Add("-j"); + } else { + makeCommand.Add("-j" + std::to_string(jobs)); } } |