diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-29 14:02:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-29 14:05:09 (GMT) |
| commit | f248f8ad7898816a5a627e288d3a04fed993967f (patch) | |
| tree | 39474bb70be2d89d344e55ba4aa5def19905ee28 /Source/cmMakefile.cxx | |
| parent | 42752d0c11df67a9ca4f5e71efa58965c58552f8 (diff) | |
| parent | 1ab3881ec9e809ac5f6cad5cd84048310b8683e2 (diff) | |
| download | CMake-f248f8ad7898816a5a627e288d3a04fed993967f.zip CMake-f248f8ad7898816a5a627e288d3a04fed993967f.tar.gz CMake-f248f8ad7898816a5a627e288d3a04fed993967f.tar.bz2 | |
Merge topic 'parallel_build_option'
1ab3881ec9 cmake: Add options for parallel builds to --build mode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !1962
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0d0ba42..d67d280 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3268,7 +3268,7 @@ void cmMakefile::EnableLanguage(std::vector<std::string> const& lang, int cmMakefile::TryCompile(const std::string& srcdir, const std::string& bindir, const std::string& projectName, - const std::string& targetName, bool fast, + const std::string& targetName, bool fast, int jobs, const std::vector<std::string>* cmakeArgs, std::string& output) { @@ -3380,7 +3380,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, // finally call the generator to actually build the resulting project int ret = this->GetGlobalGenerator()->TryCompile( - srcdir, bindir, projectName, targetName, fast, output, this); + jobs, srcdir, bindir, projectName, targetName, fast, output, this); this->IsSourceFileTryCompile = false; return ret; |