summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-12-01 21:31:14 (GMT)
committerBrad King <brad.king@kitware.com>2021-01-05 14:29:18 (GMT)
commitdacd93a2dbea64d4021ef2ddc4cd1ad03be415b6 (patch)
treec0a4c87543af46caae4651a8b5d19a80857d2d46
parent533386ca2961060b81fce2f0532a55ed76b1b53d (diff)
downloadCMake-dacd93a2dbea64d4021ef2ddc4cd1ad03be415b6.zip
CMake-dacd93a2dbea64d4021ef2ddc4cd1ad03be415b6.tar.gz
CMake-dacd93a2dbea64d4021ef2ddc4cd1ad03be415b6.tar.bz2
ninja: De-duplicate version numbers required for ninja features
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index a098f81..b0b0cd6 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -766,7 +766,8 @@ bool cmGlobalNinjaGenerator::CheckFortran(cmMakefile* mf) const
e <<
"The Ninja generator does not support Fortran using Ninja version\n"
" " << this->NinjaVersion << "\n"
- "due to lack of required features. Ninja 1.10 or higher is required."
+ "due to lack of required features. "
+ "Ninja " << RequiredNinjaVersionForDyndeps() << " or higher is required."
;
/* clang-format on */
mf->IssueMessage(MessageType::FATAL_ERROR, e.str());
@@ -785,7 +786,9 @@ bool cmGlobalNinjaGenerator::CheckISPC(cmMakefile* mf) const
e <<
"The Ninja generator does not support ISPC using Ninja version\n"
" " << this->NinjaVersion << "\n"
- "due to lack of required features. Ninja 1.10 or higher is required."
+ "due to lack of required features. "
+ "Ninja " << RequiredNinjaVersionForMultipleOutputs() <<
+ " or higher is required."
;
/* clang-format on */
mf->IssueMessage(MessageType::FATAL_ERROR, e.str());