diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-19 16:28:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-19 16:30:20 (GMT) |
| commit | aa6437e3e0132b959cc28cb7a8115f82b92c754e (patch) | |
| tree | 6541a25d9fb3d3065f21d51413addfcf546b877e | |
| parent | ba773cfec84540799a8a741ec388218013699769 (diff) | |
| parent | 7d6639bf8d9298d9f4c81fa035cda5d34a6e1622 (diff) | |
| download | CMake-aa6437e3e0132b959cc28cb7a8115f82b92c754e.zip CMake-aa6437e3e0132b959cc28cb7a8115f82b92c754e.tar.gz CMake-aa6437e3e0132b959cc28cb7a8115f82b92c754e.tar.bz2 | |
Merge topic 'codelite_make_j_0'
7d6639bf8d CodeLite: Do not pass -j argument with CPU count 0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4067
| -rw-r--r-- | Source/cmExtraCodeLiteGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 269e8dd..3557e5c 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -635,7 +635,10 @@ std::string cmExtraCodeLiteGenerator::GetBuildCommand( if (generator == "NMake Makefiles" || generator == "Ninja") { ss << make; } else if (generator == "MinGW Makefiles" || generator == "Unix Makefiles") { - ss << make << " -f$(ProjectPath)/Makefile -j " << this->CpuCount; + ss << make << " -f$(ProjectPath)/Makefile"; + if (this->CpuCount > 0) { + ss << " -j " << this->CpuCount; + } } if (!targetName.empty()) { ss << " " << targetName; |