[Cmake-commits] CMake branch, master, updated. v2.8.11.1-383-gc1631ef

[Brad King]

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, master has been updated
       via  c1631efa0eb0b33680ea73f745379eebf4d573a8 (commit)
       via  e6055284b347775ae1396725704778af0bfb56c7 (commit)
       via  48bb48e114b7141b63e9c905f0258531c6b78cb1 (commit)
      from  22fbeaa14b5d79bc065b1c3061359c886167cc01 (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=c1631efa0eb0b33680ea73f745379eebf4d573a8
commit c1631efa0eb0b33680ea73f745379eebf4d573a8
Merge: 22fbeaa e605528
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 26 09:02:49 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 26 09:02:49 2013 -0400

    Merge topic 'version-compare-genex'
    
    e605528 Add generator expressions for version comparision.
    48bb48e De-duplicate version comparison code.

diff --cc Source/cmDocumentGeneratorExpressions.h
index 12ee9fa,84f4af5..7358a36
--- a/Source/cmDocumentGeneratorExpressions.h
+++ b/Source/cmDocumentGeneratorExpressions.h
@@@ -44,10 -44,16 +44,16 @@@
    "used.\n"                                                             \
    "  $<C_COMPILER_ID:comp>     = '1' if the CMake-id of the C "         \
    "compiler matches comp, otherwise '0'.\n"                             \
 -  "  $<CXX_COMPILER_ID>          = The CMake-id of the CXX compiler "   \
 +  "  $<CXX_COMPILER_ID>        = The CMake-id of the CXX compiler "     \
    "used.\n"                                                             \
 -  "  $<CXX_COMPILER_ID:comp>     = '1' if the CMake-id of the CXX "     \
 +  "  $<CXX_COMPILER_ID:comp>   = '1' if the CMake-id of the CXX "       \
    "compiler matches comp, otherwise '0'.\n"                             \
+   "  $<VERSION_GREATER:v1,v2>  = '1' if v1 is a version greater than "  \
+   "v2, else '0'.\n"                                                     \
+   "  $<VERSION_LESS:v1,v2>     = '1' if v1 is a version less than v2, " \
+   "else '0'.\n"                                                         \
+   "  $<VERSION_EQUAL:v1,v2>    = '1' if v1 is the same version as v2, " \
+   "else '0'.\n"                                                         \
    "  $<TARGET_FILE:tgt>        = main file (.exe, .so.1.2, .a)\n"       \
    "  $<TARGET_LINKER_FILE:tgt> = file used to link (.a, .lib, .so)\n"   \
    "  $<TARGET_SONAME_FILE:tgt> = file with soname (.so.3)\n"            \

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

Summary of changes:
 Source/cmDocumentGeneratorExpressions.h     |    6 +++
 Source/cmGeneratorExpressionEvaluator.cxx   |   60 +++++++++++++++++++++++++++
 Source/cmIfCommand.cxx                      |   40 ++----------------
 Source/cmSystemTools.cxx                    |   15 ++++--
 Tests/GeneratorExpression/CMakeLists.txt    |    6 +++
 Tests/GeneratorExpression/check-part2.cmake |    6 +++
 6 files changed, 92 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
CMake