diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-28 16:34:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-28 16:34:36 (GMT) |
| commit | 8df4d03d99ba88394d931f41d679defdd226b193 (patch) | |
| tree | 7ef91610ab967bd8ba37e8d4c3fcd8cda407f44b /Help | |
| parent | ca2b012cb9dd488b74871bf481b1bb9154fdf804 (diff) | |
| parent | d0b1d2a65be658663ce7314961e13036974f62e7 (diff) | |
| download | CMake-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')
| -rw-r--r-- | Help/manual/cmake-developer.7.rst | 8 | ||||
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 9 | ||||
| -rw-r--r-- | Help/prop_inst/CPACK_NEVER_OVERWRITE.rst | 6 | ||||
| -rw-r--r-- | Help/prop_inst/CPACK_PERMANENT.rst | 6 |
4 files changed, 25 insertions, 4 deletions
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index 4ab9786..81adea0 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -376,10 +376,10 @@ documentation: See the :manual:`cmake-policies(7)` manual and the :command:`cmake_policy` command. -``prop_cache, prop_dir, prop_gbl, prop_sf, prop_test, prop_tgt`` - A CMake cache, directory, global, source file, test, or target - property, respectively. See the :manual:`cmake-properties(7)` manual - and the :command:`set_property` command. +``prop_cache, prop_dir, prop_gbl, prop_sf, prop_inst, prop_test, prop_tgt`` + A CMake cache, directory, global, source file, installed file, test, + or target property, respectively. See the :manual:`cmake-properties(7)` + manual and the :command:`set_property` command. ``variable`` A CMake language variable. 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 diff --git a/Help/prop_inst/CPACK_NEVER_OVERWRITE.rst b/Help/prop_inst/CPACK_NEVER_OVERWRITE.rst new file mode 100644 index 0000000..11f44d0 --- /dev/null +++ b/Help/prop_inst/CPACK_NEVER_OVERWRITE.rst @@ -0,0 +1,6 @@ +CPACK_NEVER_OVERWRITE +--------------------- + +Request that this file not be overwritten on install or reinstall. + +The property is currently only supported by the WIX generator. diff --git a/Help/prop_inst/CPACK_PERMANENT.rst b/Help/prop_inst/CPACK_PERMANENT.rst new file mode 100644 index 0000000..5e191d0 --- /dev/null +++ b/Help/prop_inst/CPACK_PERMANENT.rst @@ -0,0 +1,6 @@ +CPACK_PERMANENT +--------------- + +Request that this file not be removed on uninstall. + +The property is currently only supported by the WIX generator. |