[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6417-g1bfd9ff

[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  1bfd9ffff62c101ba55c061c472881645aadad27 (commit)
       via  62cba3cbd2d66d0f81c501543e6573d31f3d1c34 (commit)
      from  692d35803800b19bd213867fa5361e5f20e9ce17 (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=1bfd9ffff62c101ba55c061c472881645aadad27
commit 1bfd9ffff62c101ba55c061c472881645aadad27
Merge: 692d358 62cba3c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 26 06:13:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 26 06:13:57 2013 -0500

    Merge topic 'cmake-buildsystem-manual' into next
    
    62cba3c Fix the ALIAS test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62cba3cbd2d66d0f81c501543e6573d31f3d1c34
commit 62cba3cbd2d66d0f81c501543e6573d31f3d1c34
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 26 12:13:29 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Dec 26 12:13:29 2013 +0100

    Fix the ALIAS test.

diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 2fc4882..a1513d8 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -688,8 +688,9 @@ an ``ALIAS`` name using the :command:`if(ALIAS)` command
 
 .. code-block:: cmake
 
-  if(ALIAS Upstream::lib1)
-    message(STATUS "Using an ALIAS from the buildsystem.")
+  get_target_property(_aliased Upstream::lib1 ALIASED_TARGET)
+  if(_aliased)
+    message(STATUS "The name Upstream::lib1 is an ALIAS for ${_aliased}.")
   endif()
 
 Interface Libraries

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

Summary of changes:
 Help/manual/cmake-buildsystem.7.rst |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake