[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5620-g837a937

[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  837a937bfce21ec045570eb1c9b37e74e2621591 (commit)
       via  cabbaa13fe01034432bc4605890589f48b9638e8 (commit)
      from  2739e454e439bd6c928abdd32f8a1b9d680ca1a8 (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=837a937bfce21ec045570eb1c9b37e74e2621591
commit 837a937bfce21ec045570eb1c9b37e74e2621591
Merge: 2739e45 cabbaa1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 11:37:20 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 11:37:20 2013 -0500

    Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
    
    cabbaa1 Fixup docs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cabbaa13fe01034432bc4605890589f48b9638e8
commit cabbaa13fe01034432bc4605890589f48b9638e8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 17:36:41 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 21 17:36:41 2013 +0100

    Fixup docs.

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 886f073..8947655 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -97,8 +97,9 @@ These expressions may also may be combined with logical expressions::
 
   $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,4.2.0>:OLD_COMPILER>
 
-expands to ``OLD_COMPILER`` if the :variable:`CMAKE_<LANG>_COMPILER_VERSION` is
-less than 4.2.0.
+expands to ``OLD_COMPILER`` if the
+:variable:`CMAKE_CXX_COMPILER_VERSION <CMAKE_<LANG>_COMPILER_VERSION>` is less
+than 4.2.0.
 
 $<CONFIGURATION>
   Configuration name
@@ -140,7 +141,7 @@ $<TARGET_PROPERTY:prop>
   expression is evaluated.
 $<INSTALL_PREFIX>
   Content of the install prefix when the target is exported via
-  :command:`install` (EXPORT) and empty otherwise.
+  :command:`install(EXPORT)` and empty otherwise.
 
 Output expressions
 ------------------

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

Summary of changes:


hooks/post-receive
-- 
CMake