summaryrefslogtreecommitdiffstats
path: root/Help/manual/cmake-properties.7.rst
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-07-13 11:45:54 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-07-13 11:46:09 (GMT)
commitf5be951117711a3965db0f9cd59a2913efacece7 (patch)
tree0fa922865dcd8eb881af99c4ce50c03f3cc8a399 /Help/manual/cmake-properties.7.rst
parent37915a69304d0de36e15b024380a7ddabeb0d821 (diff)
parent376dc3eb2218c64db50ae53c04376dfb42c538ba (diff)
downloadCMake-f5be951117711a3965db0f9cd59a2913efacece7.zip
CMake-f5be951117711a3965db0f9cd59a2913efacece7.tar.gz
CMake-f5be951117711a3965db0f9cd59a2913efacece7.tar.bz2
Merge topic 'labels-for-subprojects'
376dc3eb Help: Add notes for topic 'labels_for_subprojects' a70d8e93 Add tests for new directory labels and labels-for-subprojects features 47b3a57c Display subproject timing summary d3859624 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable d08ec4d2 Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1004
Diffstat (limited to 'Help/manual/cmake-properties.7.rst')
-rw-r--r--Help/manual/cmake-properties.7.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 94ab70c..5e40fe8 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -74,6 +74,7 @@ Properties on Directories
/prop_dir/INCLUDE_REGULAR_EXPRESSION
/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG
/prop_dir/INTERPROCEDURAL_OPTIMIZATION
+ /prop_dir/LABELS
/prop_dir/LINK_DIRECTORIES
/prop_dir/LISTFILE_STACK
/prop_dir/MACROS