[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6916-g86b6c80

[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  86b6c80ab28d4d6b81b28646d04b94c06c65ccdc (commit)
       via  15d7f7fb99cda35c9c1b2eeaf3c4488cb46fb093 (commit)
       via  381282f4b0e697c90cc6148d1d7aff6d5557ee8d (commit)
      from  773994be6c8bae560db542e5229deb7f29970830 (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=86b6c80ab28d4d6b81b28646d04b94c06c65ccdc
commit 86b6c80ab28d4d6b81b28646d04b94c06c65ccdc
Merge: 773994b 15d7f7f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 9 13:44:53 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 9 13:44:53 2014 -0500

    Merge topic 'extend-docs' into next
    
    15d7f7f Remove note about usr-move.
    381282f Re-word policy doc.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15d7f7fb99cda35c9c1b2eeaf3c4488cb46fb093
commit 15d7f7fb99cda35c9c1b2eeaf3c4488cb46fb093
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 9 19:44:07 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 9 19:44:07 2014 +0100

    Remove note about usr-move.

diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index b5447a6..e87eb83 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -422,12 +422,6 @@ package.  This is necessary if complex generator expressions are used:
     $<INSTALL_INTERFACE:$<$<CONFIG:Debug>:$<INSTALL_PREFIX>/include/TgtName>>
   )
 
-As a special case, packages are not relocatable if installed to the ``/usr``
-or ``/`` prefix on linux, and ``/lib`` is a symlink to ``/usr/lib``.  This is
-a workaround for some linux distros creating such a symlink and causing the
-relative paths to be evaluated incorrectly.  As installations to ``/usr`` are
-generally managed by a package manager, they do not need to be relocatable.
-
 The :command:`export(EXPORT)` command creates an :prop_tgt:`IMPORTED` targets
 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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=381282f4b0e697c90cc6148d1d7aff6d5557ee8d
commit 381282f4b0e697c90cc6148d1d7aff6d5557ee8d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 9 19:43:07 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 9 19:43:07 2014 +0100

    Re-word policy doc.

diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 8818a24..c469de0 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -16,9 +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.  The default behavior for a policy is
-to warn by default, but that may be overridden from the command line by
-setting the :variable:`CMAKE_POLICY_DEFAULT_CMP<NNNN>` variable.
+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

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

Summary of changes:
 Help/manual/cmake-packages.7.rst |    6 ------
 Help/manual/cmake-policies.7.rst |    6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake