diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-03 16:11:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-03 16:11:09 (GMT) |
| commit | 7ab204509e04df18cb50fdb77deb48b5521a8d63 (patch) | |
| tree | dfae8df0acd8c79726aacc11b8f45f7452269f24 | |
| parent | b90d63cbfcfd00b98d519f301f93abb3138a14cb (diff) | |
| parent | 75c051139a73b65d3278c1613e984584155bbef3 (diff) | |
| download | CMake-7ab204509e04df18cb50fdb77deb48b5521a8d63.zip CMake-7ab204509e04df18cb50fdb77deb48b5521a8d63.tar.gz CMake-7ab204509e04df18cb50fdb77deb48b5521a8d63.tar.bz2 | |
Merge topic 'codelite-generator-multi-jobs-bug-fix'
75c05113 CodeLite: Use make -jN switch when generating Unix/MinGW makefiles
| -rw-r--r-- | Source/cmExtraCodeLiteGenerator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index b156691..ff84fb7 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -449,8 +449,12 @@ cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const buildCommand = make; } else if ( generator == "MinGW Makefiles" || - generator == "Unix Makefiles" || - generator == "Ninja" ) + generator == "Unix Makefiles" ) + { + ss << make << " -j " << this->CpuCount; + buildCommand = ss.str(); + } + else if ( generator == "Ninja" ) { ss << make; buildCommand = ss.str(); |