[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-173-g7ed1d19

[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  7ed1d19a74cd9febfff80bde3d98c1f5f6a260d5 (commit)
       via  c978223c859ba4a09cd30876e5f1f646748785e0 (commit)
      from  bef0a59e9e6358bba3f678eec72469e2450f616e (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=7ed1d19a74cd9febfff80bde3d98c1f5f6a260d5
commit 7ed1d19a74cd9febfff80bde3d98c1f5f6a260d5
Merge: bef0a59 c978223
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 17 10:18:00 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 17 10:18:00 2016 -0500

    Merge topic 'doc-install-component-association' into next
    
    c978223c Help: Clarify install(TARGETS) INCLUDES DESTINATION option


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c978223c859ba4a09cd30876e5f1f646748785e0
commit c978223c859ba4a09cd30876e5f1f646748785e0
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:14:54 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 189b51c..aaf12cc 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -76,13 +76,14 @@ 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] [EXCLUDE_FROM_ALL]
            [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:
@@ -102,11 +103,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``
@@ -136,6 +133,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:
 Help/command/install.rst |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake