diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-20 14:36:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-20 14:37:27 (GMT) |
| commit | 2d3aa94225e259c9bc1c0d469e6326b476d225c1 (patch) | |
| tree | b88191eb67c139f7a75cb74bfc517962d5c4f6eb /Source/cmGlobalVisualStudioGenerator.cxx | |
| parent | 7aa9961939f99c915485d86e460b9941f949d59c (diff) | |
| download | CMake-2d3aa94225e259c9bc1c0d469e6326b476d225c1.zip CMake-2d3aa94225e259c9bc1c0d469e6326b476d225c1.tar.gz CMake-2d3aa94225e259c9bc1c0d469e6326b476d225c1.tar.bz2 | |
cmGlobalGenerator: Allow FindMakeProgram to fail
Revise its signature to return `bool` so that it can fail and abort
configuration early.
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 67c355b..354ada9 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -395,7 +395,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends( } } -void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf) +bool cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf) { // Visual Studio generators know how to lookup their build tool // directly instead of needing a helper module to do it, so we @@ -403,6 +403,7 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf) if (cmSystemTools::IsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM"))) { mf->AddDefinition("CMAKE_MAKE_PROGRAM", this->GetVSMakeProgram().c_str()); } + return true; } std::string cmGlobalVisualStudioGenerator::GetUtilityDepend( |