summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2020-12-26 10:55:46 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-12-26 10:55:55 (GMT)
commitf5cdcd0606bbed903f5c8bbb3310788b2d180429 (patch)
tree3984b8ae9477602eae1a6c88eb9f30a6a8c87cd3 /Help
parentfb6b2042f2843f8d205434e081e1db6bf7798f4c (diff)
parent3eacf857e38d0835c629d7443f333de79bd13b81 (diff)
downloadCMake-f5cdcd0606bbed903f5c8bbb3310788b2d180429.zip
CMake-f5cdcd0606bbed903f5c8bbb3310788b2d180429.tar.gz
CMake-f5cdcd0606bbed903f5c8bbb3310788b2d180429.tar.bz2
Merge topic 'makefiles-custom_command-depfile'
3eacf857e3 Tests: Add case for DEPFILE in add_custom_command cfd8a5ac1f Makefiles: Add support of DEPFILE for add_custom_command a526f71266 cmGccDepfileReader: Add new function ensuring paths are valid Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5617
Diffstat (limited to 'Help')
-rw-r--r--Help/command/add_custom_command.rst21
-rw-r--r--Help/release/dev/makefile-depfile.rst5
2 files changed, 23 insertions, 3 deletions
diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst
index 567af16..9a4efd1 100644
--- a/Help/command/add_custom_command.rst
+++ b/Help/command/add_custom_command.rst
@@ -201,6 +201,10 @@ The options are:
Note that the ``IMPLICIT_DEPENDS`` option is currently supported
only for Makefile generators and will be ignored by other generators.
+ .. note::
+
+ This option cannot be specified at the same time as ``DEPFILE`` option.
+
``JOB_POOL``
.. versionadded:: 3.15
@@ -263,15 +267,26 @@ The options are:
``DEPFILE``
.. versionadded:: 3.7
- Specify a ``.d`` depfile for the :generator:`Ninja` generator.
+ Specify a ``.d`` depfile for the :generator:`Ninja` generator and
+ :ref:`Makefile Generators`.
A ``.d`` file holds dependencies usually emitted by the custom
command itself.
- Using ``DEPFILE`` with other generators than Ninja is an error.
+ Using ``DEPFILE`` with other generators than :generator:`Ninja` or
+ :ref:`Makefile Generators` is an error.
+
+ .. versionadded:: 3.20
+ Added the support of :ref:`Makefile Generators`.
If the ``DEPFILE`` argument is relative, it should be relative to
:variable:`CMAKE_CURRENT_BINARY_DIR`, and any relative paths inside the
``DEPFILE`` should also be relative to :variable:`CMAKE_CURRENT_BINARY_DIR`
- (see policy :policy:`CMP0116`.)
+ (see policy :policy:`CMP0116`. This policy is always ``NEW`` for
+ :ref:`Makefile Generators`).
+
+ .. note::
+
+ For :ref:`Makefile Generators`, this option cannot be specified at the
+ same time as ``IMPLICIT_DEPENDS`` option.
Examples: Generating Files
^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Help/release/dev/makefile-depfile.rst b/Help/release/dev/makefile-depfile.rst
new file mode 100644
index 0000000..4a3e5fb
--- /dev/null
+++ b/Help/release/dev/makefile-depfile.rst
@@ -0,0 +1,5 @@
+makefile-depfile
+----------------
+
+* The :command:`add_custom_command` command gained ``DEPFILE`` support on
+ :ref:`Makefile Generators`.