[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5639-gd167f8a

[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  d167f8a402e5abf2dd772aa7d097a5e0717027ce (commit)
       via  5456b3a00c21d0dc0e6de584a9ea0680fa3206e6 (commit)
      from  45ac542a9292d6ff7acf23b2bfa62d9f0f19e195 (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=d167f8a402e5abf2dd772aa7d097a5e0717027ce
commit d167f8a402e5abf2dd772aa7d097a5e0717027ce
Merge: 45ac542 5456b3a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 13:15:12 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 13:15:12 2013 -0500

    Merge topic 'genex-docs' into next
    
    5456b3a Fix up some links.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5456b3a00c21d0dc0e6de584a9ea0680fa3206e6
commit 5456b3a00c21d0dc0e6de584a9ea0680fa3206e6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 17:32:12 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 21 19:14:33 2013 +0100

    Fix up some links.

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index c7d2ed2..cfbe255 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
 ------------------
@@ -171,7 +172,7 @@ $<TARGET_NAME:...>
   targets to multiple dependent export sets.  The ``...`` must be a literal
   name of a target- it may not contain generator expressions.
 $<INSTALL_INTERFACE:...>
-  Content of ``...`` when the property is exported using :command:`install` (EXPORT),
+  Content of ``...`` when the property is exported using :command:`install(EXPORT)`,
   and empty otherwise.
 $<BUILD_INTERFACE:...>
   Content of ``...`` when the property is exported using :command:`export`, or

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

Summary of changes:
 Help/manual/cmake-generator-expressions.7.rst |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake