[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-933-gb8b3214
Brad King
brad.king at kitware.com
Mon Dec 1 08:48:52 EST 2014
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 b8b3214f0a3cb78e84c3b3c00547ab0533987fd3 (commit)
via 89bb34d3499efd0ae78324d53ca0bdead2c3e660 (commit)
via 07254a8166f7f45d284b0982c59b185037d21bc1 (commit)
via a1aceb2585cb4b1e4e58ac32d9435ed43ad2d1d2 (commit)
from 2277af9de5a7cdb3d700746716f88390cadb4fb2 (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=b8b3214f0a3cb78e84c3b3c00547ab0533987fd3
commit b8b3214f0a3cb78e84c3b3c00547ab0533987fd3
Merge: 2277af9 89bb34d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 1 08:48:51 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 1 08:48:51 2014 -0500
Merge topic 'doc-installed-file-property' into next
89bb34d3 Help: Add 3.1 release notes for INSTALL property scope
07254a81 Help: Document installed file property API
a1aceb25 Help: Format set_property and get_property command docs
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89bb34d3499efd0ae78324d53ca0bdead2c3e660
commit 89bb34d3499efd0ae78324d53ca0bdead2c3e660
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 26 17:33:53 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 1 08:48:22 2014 -0500
Help: Add 3.1 release notes for INSTALL property scope
diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst
index 65aae00..c6a9717 100644
--- a/Help/release/3.1.0.rst
+++ b/Help/release/3.1.0.rst
@@ -69,9 +69,15 @@ Commands
:variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY`
variables to skip searching the package registries.
+* The :command:`get_property` command learned a new ``INSTALL`` scope
+ for properties.
+
* The :command:`install` command learned a ``MESSAGE_NEVER`` option
to avoid output during installation.
+* The :command:`set_property` command learned a new ``INSTALL`` scope
+ for properties.
+
* The :command:`string` command learned a new ``GENEX_STRIP`` subcommand
which removes
:manual:`generator expression <cmake-generator-expressions(7)>`.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07254a8166f7f45d284b0982c59b185037d21bc1
commit 07254a8166f7f45d284b0982c59b185037d21bc1
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Nov 26 17:22:24 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 1 08:48:19 2014 -0500
Help: Document installed file property API
Since commit v3.1.0-rc1~479^2~1 (Add an "installed file" property
scope, 2014-05-15) the get_property and set_property commands
support an 'INSTALL' scope. Add documentation for this scope.
diff --git a/Help/command/get_property.rst b/Help/command/get_property.rst
index abec8f9..632ece6 100644
--- a/Help/command/get_property.rst
+++ b/Help/command/get_property.rst
@@ -10,6 +10,7 @@ Get a property.
DIRECTORY [dir] |
TARGET <target> |
SOURCE <source> |
+ INSTALL <file> |
TEST <test> |
CACHE <entry> |
VARIABLE>
@@ -35,6 +36,9 @@ be one of the following:
``SOURCE``
Scope must name one source file.
+``INSTALL``
+ Scope must name one installed file path.
+
``TEST``
Scope must name one existing test.
diff --git a/Help/command/set_property.rst b/Help/command/set_property.rst
index 8c4f610..6200230 100644
--- a/Help/command/set_property.rst
+++ b/Help/command/set_property.rst
@@ -9,6 +9,7 @@ Set a named property in a given scope.
DIRECTORY [dir] |
TARGET [target1 [target2 ...]] |
SOURCE [src1 [src2 ...]] |
+ INSTALL [file1 [file2 ...]] |
TEST [test1 [test2 ...]] |
CACHE [entry1 [entry2 ...]]>
[APPEND] [APPEND_STRING]
@@ -34,6 +35,22 @@ be one of the following:
file properties are visible only to targets added in the same
directory (CMakeLists.txt).
+``INSTALL``
+ Scope may name zero or more installed file paths.
+ 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.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1aceb2585cb4b1e4e58ac32d9435ed43ad2d1d2
commit a1aceb2585cb4b1e4e58ac32d9435ed43ad2d1d2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 26 17:27:31 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 1 08:47:58 2014 -0500
Help: Format set_property and get_property command docs
diff --git a/Help/command/get_property.rst b/Help/command/get_property.rst
index c2937be..abec8f9 100644
--- a/Help/command/get_property.rst
+++ b/Help/command/get_property.rst
@@ -21,29 +21,37 @@ specifies the variable in which to store the result. The second
argument determines the scope from which to get the property. It must
be one of the following:
-GLOBAL scope is unique and does not accept a name.
+``GLOBAL``
+ Scope is unique and does not accept a name.
-DIRECTORY scope defaults to the current directory but another
-directory (already processed by CMake) may be named by full or
-relative path.
+``DIRECTORY``
+ Scope defaults to the current directory but another
+ directory (already processed by CMake) may be named by full or
+ relative path.
-TARGET scope must name one existing target.
+``TARGET``
+ Scope must name one existing target.
-SOURCE scope must name one source file.
+``SOURCE``
+ Scope must name one source file.
-TEST scope must name one existing test.
+``TEST``
+ Scope must name one existing test.
-CACHE scope must name one cache entry.
+``CACHE``
+ Scope must name one cache entry.
-VARIABLE scope is unique and does not accept a name.
+``VARIABLE``
+ Scope is unique and does not accept a name.
-The required PROPERTY option is immediately followed by the name of
+The required ``PROPERTY`` option is immediately followed by the name of
the property to get. If the property is not set an empty value is
-returned. If the SET option is given the variable is set to a boolean
-value indicating whether the property has been set. If the DEFINED
+returned. If the ``SET`` option is given the variable is set to a boolean
+value indicating whether the property has been set. If the ``DEFINED``
option is given the variable is set to a boolean value indicating
-whether the property has been defined such as with define_property.
-If BRIEF_DOCS or FULL_DOCS is given then the variable is set to a
+whether the property has been defined such as with the
+:command:`define_property` command.
+If ``BRIEF_DOCS`` or ``FULL_DOCS`` is given then the variable is set to a
string containing documentation for the requested property. If
documentation is requested for a property that has not been defined
-NOTFOUND is returned.
+``NOTFOUND`` is returned.
diff --git a/Help/command/set_property.rst b/Help/command/set_property.rst
index 8cb963e..8c4f610 100644
--- a/Help/command/set_property.rst
+++ b/Help/command/set_property.rst
@@ -18,26 +18,32 @@ Set one property on zero or more objects of a scope. The first
argument determines the scope in which the property is set. It must
be one of the following:
-GLOBAL scope is unique and does not accept a name.
+``GLOBAL``
+ Scope is unique and does not accept a name.
-DIRECTORY scope defaults to the current directory but another
-directory (already processed by CMake) may be named by full or
-relative path.
+``DIRECTORY``
+ Scope defaults to the current directory but another
+ directory (already processed by CMake) may be named by full or
+ relative path.
-TARGET scope may name zero or more existing targets.
+``TARGET``
+ Scope may name zero or more existing targets.
-SOURCE scope may name zero or more source files. Note that source
-file properties are visible only to targets added in the same
-directory (CMakeLists.txt).
+``SOURCE``
+ Scope may name zero or more source files. Note that source
+ file properties are visible only to targets added in the same
+ directory (CMakeLists.txt).
-TEST scope may name zero or more existing tests.
+``TEST``
+ Scope may name zero or more existing tests.
-CACHE scope must name zero or more cache existing entries.
+``CACHE``
+ Scope must name zero or more cache existing entries.
-The required PROPERTY option is immediately followed by the name of
+The required ``PROPERTY`` option is immediately followed by the name of
the property to set. Remaining arguments are used to compose the
property value in the form of a semicolon-separated list. If the
-APPEND option is given the list is appended to any existing property
-value.If the APPEND_STRING option is given the string is append to any
+``APPEND`` option is given the list is appended to any existing property
+value. If the ``APPEND_STRING`` option is given the string is append to any
existing property value as string, i.e. it results in a longer string
and not a list of strings.
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list