[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6919-g58619db

[Stephen Kelly]

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  58619db936ab0a3fea9ab8a6aec58fa5b527f7b7 (commit)
       via  2f15a0772772977529afe159f5f9146941cbfbc8 (commit)
       via  bb8bde35b8eb75d0edb8bc2812ddc22bdc61fd58 (commit)
      from  86b6c80ab28d4d6b81b28646d04b94c06c65ccdc (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=58619db936ab0a3fea9ab8a6aec58fa5b527f7b7
commit 58619db936ab0a3fea9ab8a6aec58fa5b527f7b7
Merge: 86b6c80 2f15a07
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 9 13:45:45 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 9 13:45:45 2014 -0500

    Merge topic 'extend-docs' into next
    
    2f15a07 Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual.
    bb8bde3 Help: Add notes about relocatability of config-file packages.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f15a0772772977529afe159f5f9146941cbfbc8
commit 2f15a0772772977529afe159f5f9146941cbfbc8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 9 14:53:38 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 9 19:45:08 2014 +0100

    Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual.

diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 9138660..c469de0 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -16,7 +16,9 @@ versions will begin to warn about the backward compatible behavior.  It
 is possible to disable the warning by explicitly requesting the OLD, or
 backward compatible behavior using the :command:`cmake_policy` command.
 It is also possible to request NEW, or non-backward compatible behavior
-for a policy, also avoiding the warning.
+for a policy, also avoiding the warning.  Each policy can also be set to
+either NEW or OLD behavior explicitly on the command line with the
+:variable:`CMAKE_POLICY_DEFAULT_CMP<NNNN>` variable.
 
 The :command:`cmake_minimum_required` command does more than report an
 error if a too-old version of CMake is used to build a project.  It

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb8bde35b8eb75d0edb8bc2812ddc22bdc61fd58
commit bb8bde35b8eb75d0edb8bc2812ddc22bdc61fd58
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 7 18:15:27 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 9 19:45:08 2014 +0100

    Help: Add notes about relocatability of config-file packages.

diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index b572bf7..e87eb83 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -392,11 +392,41 @@ should be provided by the ``ClimbingStats`` package, they should
 be in a separate file which is installed to the same location as the
 ``ClimbingStatsConfig.cmake`` file, and included from there.
 
+Packages created by :command:`install(EXPORT)` are designed to be relocatable,
+using paths relative to the location of the package itself.  When defining
+the interface of a target for ``EXPORT``, keep in mind that the include
+directories should be specified as relative paths which are relative to the
+:variable:`CMAKE_INSTALL_PREFIX`:
+
+.. code-block:: cmake
+
+  target_include_directories(tgt INTERFACE
+    # Wrong, not relocatable:
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/TgtName>
+  )
+
+  target_include_directories(tgt INTERFACE
+    # Ok, relocatable:
+    $<INSTALL_INTERFACE:include/TgtName>
+  )
+
+The ``$<INSTALL_PREFIX>``
+:manual:`generator expression <cmake-generator-expressions(7)>` may be used as
+a placeholder for the install prefix without resulting in a non-relocatable
+package.  This is necessary if complex generator expressions are used:
+
+.. code-block:: cmake
+
+  target_include_directories(tgt INTERFACE
+    # Ok, relocatable:
+    $<INSTALL_INTERFACE:$<$<CONFIG:Debug>:$<INSTALL_PREFIX>/include/TgtName>>
+  )
+
 The :command:`export(EXPORT)` command creates an :prop_tgt:`IMPORTED` targets
-definition file which is specific to the build-tree.  This can similiarly be
-used with a suitable package configuration file and package version file to
-define a package for the build tree which may be used without installation.
-Consumers of the build tree can simply ensure that the
+definition file which is specific to the build-tree, and is not relocatable.
+This can similiarly be used with a suitable package configuration file and
+package version file to define a package for the build tree which may be used
+without installation.  Consumers of the build tree can simply ensure that the
 :variable:`CMAKE_PREFIX_PATH` contains the build directory, or set the
 ``ClimbingStats_DIR`` to ``<build_dir>/ClimbingStats`` in the cache.
 

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

Summary of changes:


hooks/post-receive
-- 
CMake