diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-21 12:59:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-21 12:59:30 (GMT) |
| commit | e094c8fa0aa3827b0e81660ad5e29d85b216d60f (patch) | |
| tree | d3fddef3aa2a9b72bc2bd1f7b55edb1ecde5b771 /Source/cmGlobalVisualStudioGenerator.cxx | |
| parent | 97670dbf2fa567998c26686caa4f03b6f4e78967 (diff) | |
| parent | 010560be6674def3ce02d05dcf2331230d0c4e91 (diff) | |
| download | CMake-e094c8fa0aa3827b0e81660ad5e29d85b216d60f.zip CMake-e094c8fa0aa3827b0e81660ad5e29d85b216d60f.tar.gz CMake-e094c8fa0aa3827b0e81660ad5e29d85b216d60f.tar.bz2 | |
Merge topic 'ninja-diagnose-missing-tool'
010560be Ninja: Fail early on when ninja build tool does not run
2d3aa942 cmGlobalGenerator: Allow FindMakeProgram to fail
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( |