diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2019-06-25 15:03:24 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2019-07-11 12:28:35 (GMT) |
| commit | cd681f1f414487978009bf489607325c2966824b (patch) | |
| tree | 242f10145eddedbae8bd4b6a99073b7640642d99 /Source/CTest | |
| parent | d2ac3e3e59c8bb9955e65b3964857c58f4ef208a (diff) | |
| download | CMake-cd681f1f414487978009bf489607325c2966824b.zip CMake-cd681f1f414487978009bf489607325c2966824b.tar.gz CMake-cd681f1f414487978009bf489607325c2966824b.tar.bz2 | |
ctest: propagate make program to cmake
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); |