diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-20 11:53:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-20 11:53:49 (GMT) |
| commit | aae1efc7d26679dc1f1bb0653719f364dd9bcb92 (patch) | |
| tree | 0e7573c3d2dad7008b71464382009e3550eb6317 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 04e05550bbd94ebd48dd3a034856df7f5b7d826f (diff) | |
| parent | f2fa7d20b2cef29c82976822147b79ae1044a8da (diff) | |
| download | CMake-aae1efc7d26679dc1f1bb0653719f364dd9bcb92.zip CMake-aae1efc7d26679dc1f1bb0653719f364dd9bcb92.tar.gz CMake-aae1efc7d26679dc1f1bb0653719f364dd9bcb92.tar.bz2 | |
Merge topic 'ninja-fortran-doc'
f2fa7d20b2 Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-doc
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4626
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 716d7df..0cdbcc7 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -712,14 +712,7 @@ 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. " - "Kitware has implemented the required features and they have been " - "merged to upstream ninja for inclusion in Ninja 1.10 and higher. " - "As of this version of CMake, Ninja 1.10 has not been released. " - "Meanwhile, Kitware maintains a branch of Ninja at:\n" - " https://github.com/Kitware/ninja/tree/features-for-fortran#readme\n" - "with the required features. " - "One may build ninja from that branch to get support for Fortran." + "due to lack of required features. Ninja 1.10 or higher is required." ; /* clang-format on */ mf->IssueMessage(MessageType::FATAL_ERROR, e.str()); |