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 | be88264abecf73cb363a62b0c2bcd71613699543 (patch) | |
| tree | 8b5c1f07bba6abaf112bfede66d13d950a79d228 | |
| parent | ee79216b828196e8e4ff0a92ee0c481faddc4709 (diff) | |
| parent | fa31c195b85e1f0d8553b07d5aff2f090311bbf3 (diff) | |
| download | CMake-be88264abecf73cb363a62b0c2bcd71613699543.zip CMake-be88264abecf73cb363a62b0c2bcd71613699543.tar.gz CMake-be88264abecf73cb363a62b0c2bcd71613699543.tar.bz2 | |
Merge topic 'ninja-fortran-doc' into release-3.17
fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4626
| -rw-r--r-- | Help/generator/Ninja.rst | 6 | ||||
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Help/generator/Ninja.rst b/Help/generator/Ninja.rst index 275055d..08ee81b 100644 --- a/Help/generator/Ninja.rst +++ b/Help/generator/Ninja.rst @@ -33,11 +33,7 @@ Fortran Support ^^^^^^^^^^^^^^^ The ``Ninja`` generator conditionally supports Fortran when the ``ninja`` -tool has the required features. As of this version of CMake the needed -features have not been integrated into upstream Ninja. Kitware maintains -a branch of Ninja with the required features on `github.com/Kitware/ninja`_. - -.. _`github.com/Kitware/ninja`: https://github.com/Kitware/ninja/tree/features-for-fortran#readme +tool is at least version 1.10 (which has the required features). See Also ^^^^^^^^ diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 331cf78..d1577ac 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -714,14 +714,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()); |