summaryrefslogtreecommitdiffstats
path: root/Help/manual/cmake-properties.7.rst
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-05-28 16:34:36 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-05-28 16:34:36 (GMT)
commit8df4d03d99ba88394d931f41d679defdd226b193 (patch)
tree7ef91610ab967bd8ba37e8d4c3fcd8cda407f44b /Help/manual/cmake-properties.7.rst
parentca2b012cb9dd488b74871bf481b1bb9154fdf804 (diff)
parentd0b1d2a65be658663ce7314961e13036974f62e7 (diff)
downloadCMake-8df4d03d99ba88394d931f41d679defdd226b193.zip
CMake-8df4d03d99ba88394d931f41d679defdd226b193.tar.gz
CMake-8df4d03d99ba88394d931f41d679defdd226b193.tar.bz2
Merge topic 'cpack-properties'
d0b1d2a6 CPackWiX: Implement CPACK_NEVER_OVERWRITE and CPACK_PERMANENT properties 15a8af21 Add an "installed file" property scope
Diffstat (limited to 'Help/manual/cmake-properties.7.rst')
-rw-r--r--Help/manual/cmake-properties.7.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 52dfd02..e4546c1 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -308,3 +308,12 @@ Properties on Cache Entries
/prop_cache/STRINGS
/prop_cache/TYPE
/prop_cache/VALUE
+
+Properties on Installed Files
+=============================
+
+.. toctree::
+ :maxdepth: 1
+
+ /prop_inst/CPACK_NEVER_OVERWRITE.rst
+ /prop_inst/CPACK_PERMANENT.rst