[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-198-gb1f7f3b

[Brad King]

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  b1f7f3b50850c77a686f9439f84631f94fd9da35 (commit)
       via  d7c6b7103b3e247224dfb5b09959f9d2c8cc1898 (commit)
       via  70f2708fa58da21ef19986872aee530a84cc9ad0 (commit)
      from  009b3d281a085f481caa886267eaf2263c4f2a48 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1f7f3b50850c77a686f9439f84631f94fd9da35
commit b1f7f3b50850c77a686f9439f84631f94fd9da35
Merge: 009b3d2 d7c6b71
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 18 10:02:24 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 18 10:02:24 2016 -0500

    Merge topic 'doc-install-component-association' into next
    
    d7c6b710 Merge branch 'backport-doc-install-component-association' into doc-install-component-association
    70f2708f Help: Clarify install(TARGETS) INCLUDES DESTINATION option


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7c6b7103b3e247224dfb5b09959f9d2c8cc1898
commit d7c6b7103b3e247224dfb5b09959f9d2c8cc1898
Merge: c978223 70f2708
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 17 10:15:21 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 17 10:15:30 2016 -0500

    Merge branch 'backport-doc-install-component-association' into doc-install-component-association


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70f2708fa58da21ef19986872aee530a84cc9ad0
commit 70f2708fa58da21ef19986872aee530a84cc9ad0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 17 10:11:01 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 17 10:12:10 2016 -0500

    Help: Clarify install(TARGETS) INCLUDES DESTINATION option
    
    The option does not actually participate in argument groups like the
    others because it does not actually install anything.  Fix the order
    in the documentation accordingly.
    
    Reported-by: Daniel Wirtz <daniel.wirtz at simtech.uni-stuttgart.de>

diff --git a/Help/command/install.rst b/Help/command/install.rst
index 5d2add7..45167bc 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -72,12 +72,13 @@ Installing Targets
           [[ARCHIVE|LIBRARY|RUNTIME|FRAMEWORK|BUNDLE|
             PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE]
            [DESTINATION <dir>]
-           [INCLUDES DESTINATION [<dir> ...]]
            [PERMISSIONS permissions...]
            [CONFIGURATIONS [Debug|Release|...]]
            [COMPONENT <component>]
            [OPTIONAL] [NAMELINK_ONLY|NAMELINK_SKIP]
-          ] [...])
+          ] [...]
+          [INCLUDES DESTINATION [<dir> ...]]
+          )
 
 The ``TARGETS`` form specifies rules for installing targets from a
 project.  There are five kinds of target files that may be installed:
@@ -97,11 +98,7 @@ change the type of target to which the subsequent properties apply.
 If none is given the installation properties apply to all target
 types.  If only one is given then only targets of that type will be
 installed (which can be used to install just a DLL or just an import
-library).  The ``INCLUDES DESTINATION`` specifies a list of directories
-which will be added to the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES`
-target property of the ``<targets>`` when exported by the
-:command:`install(EXPORT)` command.  If a relative path is
-specified, it is treated as relative to the ``$<INSTALL_PREFIX>``.
+library).
 
 The ``PRIVATE_HEADER``, ``PUBLIC_HEADER``, and ``RESOURCE`` arguments
 cause subsequent properties to be applied to installing a ``FRAMEWORK``
@@ -131,6 +128,14 @@ option installs nothing.  See the :prop_tgt:`VERSION` and
 :prop_tgt:`SOVERSION` target properties for details on creating versioned
 shared libraries.
 
+The ``INCLUDES DESTINATION`` specifies a list of directories
+which will be added to the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES`
+target property of the ``<targets>`` when exported by the
+:command:`install(EXPORT)` command.  If a relative path is
+specified, it is treated as relative to the ``$<INSTALL_PREFIX>``.
+This is independent of the rest of the argument groups and does
+not actually install anything.
+
 One or more groups of properties may be specified in a single call to
 the ``TARGETS`` form of this command.  A target may be installed more than
 once to different locations.  Consider hypothetical targets ``myExe``,

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

Summary of changes:


hooks/post-receive
-- 
CMake