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/cmGlobalVisualStudio10Generator.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/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 02ffa41..7af971e 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -357,11 +357,14 @@ cmGlobalVisualStudio10Generator::GetPlatformToolsetHostArchitecture() const return CM_NULLPTR; } -void cmGlobalVisualStudio10Generator::FindMakeProgram(cmMakefile* mf) +bool cmGlobalVisualStudio10Generator::FindMakeProgram(cmMakefile* mf) { - this->cmGlobalVisualStudio8Generator::FindMakeProgram(mf); + if (!this->cmGlobalVisualStudio8Generator::FindMakeProgram(mf)) { + return false; + } mf->AddDefinition("CMAKE_VS_MSBUILD_COMMAND", this->GetMSBuildCommand().c_str()); + return true; } std::string const& cmGlobalVisualStudio10Generator::GetMSBuildCommand() |