[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-911-gb3b133e

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b3b133e2685bb73fd7ec3ed75d88cb05194f57c1 (commit)
       via  7b85d450e44127590bb7be47f845e2ab5a0cb4c0 (commit)
      from  d7daa15d2d4713deda0e719fa2418d8595d6177f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3b133e2685bb73fd7ec3ed75d88cb05194f57c1
commit b3b133e2685bb73fd7ec3ed75d88cb05194f57c1
Merge: d7daa15 7b85d45
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Nov 27 03:18:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 27 03:18:47 2014 -0500

    Merge topic 'doc-installed-file-property' into next
    
    7b85d450 Help: Extend documentation for installed file properties.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b85d450e44127590bb7be47f845e2ab5a0cb4c0
commit 7b85d450e44127590bb7be47f845e2ab5a0cb4c0
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Nov 27 09:17:45 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Nov 27 09:17:45 2014 +0100

    Help: Extend documentation for installed file properties.

diff --git a/Help/command/get_property.rst b/Help/command/get_property.rst
index 8bd2549..632ece6 100644
--- a/Help/command/get_property.rst
+++ b/Help/command/get_property.rst
@@ -10,7 +10,7 @@ Get a property.
                 DIRECTORY [dir]    |
                 TARGET    <target> |
                 SOURCE    <source> |
-                INSTALL   <file> |
+                INSTALL   <file>   |
                 TEST      <test>   |
                 CACHE     <entry>  |
                 VARIABLE>
diff --git a/Help/command/set_property.rst b/Help/command/set_property.rst
index fdb17bc..6200230 100644
--- a/Help/command/set_property.rst
+++ b/Help/command/set_property.rst
@@ -9,7 +9,7 @@ Set a named property in a given scope.
                 DIRECTORY [dir]                   |
                 TARGET    [target1 [target2 ...]] |
                 SOURCE    [src1 [src2 ...]]       |
-                INSTALL   [file1 [file2 ...]]       |
+                INSTALL   [file1 [file2 ...]]     |
                 TEST      [test1 [test2 ...]]     |
                 CACHE     [entry1 [entry2 ...]]>
                [APPEND] [APPEND_STRING]
@@ -37,7 +37,19 @@ be one of the following:
 
 ``INSTALL``
   Scope may name zero or more installed file paths.
-  These are made available to CPack to influence packaging.
+  These are made available to CPack to influence deployment.
+
+  Both the property key and value may use generator expressions.
+  Specific properties may apply to installed files and/or directories.
+
+  Path components have to be separated by forward slashes,
+  must be normalized and are case sensitive.
+
+  To reference the installation prefix itself with a relative path use ".".
+
+  Currently installed file properties are only defined for
+  the WIX generator where the given paths are relative
+  to the installation prefix.
 
 ``TEST``
   Scope may name zero or more existing tests.

-----------------------------------------------------------------------

Summary of changes:
 Help/command/get_property.rst |    2 +-
 Help/command/set_property.rst |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake