summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-02-27 13:20:33 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-02-27 13:21:32 (GMT)
commitb13a8441cd1338ac9f8352a4df54759a1b19088a (patch)
tree7d556ee89e8b51ca710eaea48ca57100fac015bc /Help
parent07421e678556a7381578cafc9d717bd485f8a39c (diff)
parentf22c18b1c1554b573c684efcb5c921c17c9b0f1d (diff)
downloadCMake-b13a8441cd1338ac9f8352a4df54759a1b19088a.zip
CMake-b13a8441cd1338ac9f8352a4df54759a1b19088a.tar.gz
CMake-b13a8441cd1338ac9f8352a4df54759a1b19088a.tar.bz2
Merge topic 'ninja-dyndep-lang-aware'
f22c18b1c1 ninja: name dyndep internal files using the object file 7c78adca8e cmNinjaTargetGenerator: remove "preprocessed" mentions in dyndep 933dd91642 ninja: do not assume explicit preprocessing uses that output 2c0a7bc770 ninja: pass language to cmake_ninja_depends 72f9bb2993 ninja: make dyndep generation language aware 2dd0cb7aeb Help: note that Ninja also uses OBJECT_OUTPUTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2997
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_sf/OBJECT_OUTPUTS.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/prop_sf/OBJECT_OUTPUTS.rst b/Help/prop_sf/OBJECT_OUTPUTS.rst
index 6a28553..1ce4866 100644
--- a/Help/prop_sf/OBJECT_OUTPUTS.rst
+++ b/Help/prop_sf/OBJECT_OUTPUTS.rst
@@ -1,9 +1,9 @@
OBJECT_OUTPUTS
--------------
-Additional outputs for a Makefile rule.
+Additional outputs for a Ninja or Makefile rule.
Additional outputs created by compilation of this source file. If any
of these outputs is missing the object will be recompiled. This is
-supported only on Makefile generators and will be ignored on other
-generators.
+supported only on the Ninja and Makefile generators and will be ignored on
+other generators.