diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-12 20:10:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-12 20:10:32 (GMT) |
| commit | 82a72bfc1b90373c936c5010ece28423906e1e74 (patch) | |
| tree | a29f8d6c4c6318dd48d1b3c5329577a9bfd152bf /Source/CTest | |
| parent | f9e0cf64176628d07871741da2c6f585f52c4e39 (diff) | |
| parent | cd681f1f414487978009bf489607325c2966824b (diff) | |
| download | CMake-82a72bfc1b90373c936c5010ece28423906e1e74.zip CMake-82a72bfc1b90373c936c5010ece28423906e1e74.tar.gz CMake-82a72bfc1b90373c936c5010ece28423906e1e74.tar.bz2 | |
Merge topic 'ctest_make_program__propagated_to_cmake_configure_pass'
cd681f1f41 ctest: propagate make program to cmake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3483
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 9ad9669..3aea1f4 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -76,6 +76,11 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring, if (config) { args.push_back("-DCMAKE_BUILD_TYPE:STRING=" + std::string(config)); } + if (!this->BuildMakeProgram.empty() && + (this->BuildGenerator.find("Make") != std::string::npos || + this->BuildGenerator.find("Ninja") != std::string::npos)) { + args.push_back("-DCMAKE_MAKE_PROGRAM:FILEPATH=" + this->BuildMakeProgram); + } for (std::string const& opt : this->BuildOptions) { args.push_back(opt); |