summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-05-21 15:52:04 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-05-21 15:52:12 (GMT)
commit9ec09f22ff1b1109d9bb7b4e8d1aec5663029cd3 (patch)
treedaea1233f4d577e5a0287417c1127a88f9be3875 /Help
parent3c5d52579b271e99475873cec953a1ecccbea585 (diff)
parentf6cb1e646ca108125c33419e0829c152effaee47 (diff)
downloadCMake-9ec09f22ff1b1109d9bb7b4e8d1aec5663029cd3.zip
CMake-9ec09f22ff1b1109d9bb7b4e8d1aec5663029cd3.tar.gz
CMake-9ec09f22ff1b1109d9bb7b4e8d1aec5663029cd3.tar.bz2
Merge topic 'multi-ninja-pch-msvc'
f6cb1e646c Multi-Ninja: Fix PCHs for Visual C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4771
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_sf/OBJECT_OUTPUTS.rst3
-rw-r--r--Help/release/dev/genex-OBJECT_OUTPUTS.rst4
2 files changed, 7 insertions, 0 deletions
diff --git a/Help/prop_sf/OBJECT_OUTPUTS.rst b/Help/prop_sf/OBJECT_OUTPUTS.rst
index e7e880b..3e799ed 100644
--- a/Help/prop_sf/OBJECT_OUTPUTS.rst
+++ b/Help/prop_sf/OBJECT_OUTPUTS.rst
@@ -7,3 +7,6 @@ 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 the :generator:`Ninja` and :ref:`Makefile Generators`
and will be ignored on other generators.
+
+This property supports
+:manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/genex-OBJECT_OUTPUTS.rst b/Help/release/dev/genex-OBJECT_OUTPUTS.rst
new file mode 100644
index 0000000..738dcbb
--- /dev/null
+++ b/Help/release/dev/genex-OBJECT_OUTPUTS.rst
@@ -0,0 +1,4 @@
+genex-OBJECT_OUTPUTS
+--------------------
+
+* :prop_sf:`OBJECT_OUTPUTS` now support :manual:`generator expressions <cmake-generator-expressions(7)>`.