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/cmGlobalGhsMultiGenerator.h | |
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/cmGlobalGhsMultiGenerator.h')
-rw-r--r-- | Source/cmGlobalGhsMultiGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index 27a40ba..7b3eebb 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -57,7 +57,7 @@ public: /* * Determine what program to use for building the project. */ - virtual void FindMakeProgram(cmMakefile*); + bool FindMakeProgram(cmMakefile* mf) CM_OVERRIDE; cmGeneratedFileStream* GetBuildFileStream() { |