summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-23 12:40:16 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-23 12:40:16 (GMT)
commit3a883a9f7dd8c9f5e67475fcdce25ebd066636db (patch)
tree5b6adfb351e66c204458dc9350aa24a7c68b8685 /Help
parent961536dc85b41f77db3d2d220cbf720d0056369a (diff)
parent330581502a7c7332a8f3ec15d57e1c21f7ff1ca8 (diff)
downloadCMake-3a883a9f7dd8c9f5e67475fcdce25ebd066636db.zip
CMake-3a883a9f7dd8c9f5e67475fcdce25ebd066636db.tar.gz
CMake-3a883a9f7dd8c9f5e67475fcdce25ebd066636db.tar.bz2
Merge topic 'ninja-fortran'
33058150 Help: Document Ninja generator conditional Fortran support 59aae292 Ninja: Add dyndep rules for Fortran module dependencies 39ebfc79 Ninja: Add explicit preprocessing step for Fortran 9a77680e Ninja: Conditionally allow Fortran based on ninja 'dyndep' support 0f331d78 Ninja: Add internal tool to produce a ninja dyndep file for Fortran d3e0b64b Ninja: Add internal tool to scan Fortran code for module dependencies 8eca59a1 Ninja: Add comment with Fortran dependency design documentation a57d1bb7 Ninja: Add API to check for dyndep support 0488ae63 Ninja: Refactor ninja feature detection f0a23aa3 Ninja: Refactor Fortran rejection logic
Diffstat (limited to 'Help')
-rw-r--r--Help/generator/Ninja.rst10
-rw-r--r--Help/release/dev/ninja-fortran.rst6
2 files changed, 16 insertions, 0 deletions
diff --git a/Help/generator/Ninja.rst b/Help/generator/Ninja.rst
index ef0e28b..3bbd9dc 100644
--- a/Help/generator/Ninja.rst
+++ b/Help/generator/Ninja.rst
@@ -21,3 +21,13 @@ are generated:
``sub/dir/package``
Runs the package step in the subdirectory, if any.
+
+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
diff --git a/Help/release/dev/ninja-fortran.rst b/Help/release/dev/ninja-fortran.rst
new file mode 100644
index 0000000..612b1ff
--- /dev/null
+++ b/Help/release/dev/ninja-fortran.rst
@@ -0,0 +1,6 @@
+ninja-fortran
+-------------
+
+* The :generator:`Ninja` generator learned to conditionally support
+ Fortran when using a ``ninja`` tool that has the necessary features.
+ See generator documentation for details.