[Cmake-commits] CMake branch, master, updated. v2.8.10-62-g11b8a44

[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  11b8a44cfce1ad2383172760b9ac07a670b376fc (commit)
       via  9be64f34c299edfa69b126d419b4bd0619741656 (commit)
      from  43d3a6d49e402fa735022fd0720355a369df75fe (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=11b8a44cfce1ad2383172760b9ac07a670b376fc
commit 11b8a44cfce1ad2383172760b9ac07a670b376fc
Merge: 43d3a6d 9be64f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 6 14:13:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 6 14:13:10 2012 -0500

    Merge topic 'fix-genex-CONFIG'
    
    9be64f3 GenEx: Use case insensitive comparison for $<CONFIG:...>

diff --cc Tests/GeneratorExpression/CMakeLists.txt
index 581d483,bb31476..3a92d81
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@@ -14,11 -14,12 +14,15 @@@ add_custom_target(check AL
      -Dtest_and_1=$<AND:1>
      -Dtest_and_1_0=$<AND:1,0>
      -Dtest_and_1_1=$<AND:1,1>
 +    # Ordinarily, the 'invalidcontent' would cause an error, but
 +    # the '0' makes the AND abort early.
 +    -Dtest_and_0_invalidcontent=$<AND:0,invalidcontent>
      -Dtest_config_0=$<CONFIG:$<CONFIGURATION>x>
      -Dtest_config_1=$<CONFIG:$<CONFIGURATION>>
+     -Dtest_config_debug=$<CONFIG:Debug>$<CONFIG:DEBUG>$<CONFIG:DeBuG>
+     -Dtest_config_release=$<CONFIG:Release>$<CONFIG:RELEASE>$<CONFIG:ReLeAsE>
+     -Dtest_config_relwithdebinfo=$<CONFIG:RelWithDebInfo>$<CONFIG:RELWITHDEBINFO>$<CONFIG:relwithdebinfo>
+     -Dtest_config_minsizerel=$<CONFIG:MinSizeRel>$<CONFIG:MINSIZEREL>$<CONFIG:minsizerel>
      -Dtest_not_0=$<NOT:0>
      -Dtest_not_1=$<NOT:1>
      -Dtest_or_0=$<OR:0>
diff --cc Tests/GeneratorExpression/check.cmake
index 88a60ce,8745d57..af436de
--- a/Tests/GeneratorExpression/check.cmake
+++ b/Tests/GeneratorExpression/check.cmake
@@@ -15,9 -15,13 +15,14 @@@ check(test_and_0_1 "0"
  check(test_and_1 "1")
  check(test_and_1_0 "0")
  check(test_and_1_1 "1")
 +check(test_and_0_invalidcontent "0")
  check(test_config_0 "0")
  check(test_config_1 "1")
+ foreach(c debug release relwithdebinfo minsizerel)
+   if(NOT "${test_config_${c}}" MATCHES "^(0+|1+)$")
+     message(SEND_ERROR "test_config_${c} is \"${test_config_${c}}\", not all 0 or all 1")
+   endif()
+ endforeach()
  check(test_not_0 "1")
  check(test_not_1 "0")
  check(test_or_0 "0")

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |    5 ++++-
 Tests/CMakeLists.txt                      |    1 +
 Tests/GeneratorExpression/CMakeLists.txt  |    4 ++++
 Tests/GeneratorExpression/check.cmake     |    5 +++++
 4 files changed, 14 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake