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/CTest | |
| 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/CTest')
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index b2c68e7..fccbc95 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -253,9 +253,9 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) config = "Debug"; } int retVal = cm.GetGlobalGenerator()->Build( - this->SourceDir, this->BinaryDir, this->BuildProject, tar, output, - this->BuildMakeProgram, config, !this->BuildNoClean, false, false, - remainingTime); + cmake::NO_BUILD_PARALLEL_LEVEL, this->SourceDir, this->BinaryDir, + this->BuildProject, tar, output, this->BuildMakeProgram, config, + !this->BuildNoClean, false, false, remainingTime); out << output; // if the build failed then return if (retVal) { |