[Cmake-commits] CMake branch, next, updated. v2.8.10-743-ga7afaf8

[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, next has been updated
       via  a7afaf87a91d71482e1dbdf3f56c75ed0165c6d5 (commit)
       via  9be64f34c299edfa69b126d419b4bd0619741656 (commit)
      from  6620acb134abe93d036a0489abe1c2d38eba2088 (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=a7afaf87a91d71482e1dbdf3f56c75ed0165c6d5
commit a7afaf87a91d71482e1dbdf3f56c75ed0165c6d5
Merge: 6620acb 9be64f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 5 08:50:15 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 5 08:50:15 2012 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9be64f34c299edfa69b126d419b4bd0619741656
commit 9be64f34c299edfa69b126d419b4bd0619741656
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 1 14:21:25 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 5 08:49:25 2012 -0500

    GenEx: Use case insensitive comparison for $<CONFIG:...>
    
    This fixes a regression introduced by commit f1eacf0e
    (cmGeneratorExpression: Re-write for multi-stage evaluation).

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index ee1b60a..2e123a4 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -16,6 +16,8 @@
 #include "cmGeneratorExpressionDAGChecker.h"
 #include "cmGeneratorExpression.h"
 
+#include <cmsys/String.h>
+
 //----------------------------------------------------------------------------
 #if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x510
 static
@@ -253,7 +255,8 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
       return parameters.front().empty() ? "1" : "0";
       }
 
-    return *parameters.begin() == context->Config ? "1" : "0";
+    return cmsysString_strcasecmp(parameters.begin()->c_str(),
+                                  context->Config) == 0 ? "1" : "0";
   }
 } configurationTestNode;
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b404333..bbf804b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -556,6 +556,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-project GeneratorExpression
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+    --build-options -DCMAKE_BUILD_TYPE=\${CTEST_CONFIGURATION_TYPE}
     )
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/GeneratorExpression")
 
diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index 891fa11..bb31476 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -16,6 +16,10 @@ add_custom_target(check ALL
     -Dtest_and_1_1=$<AND:1,1>
     -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 --git a/Tests/GeneratorExpression/check.cmake b/Tests/GeneratorExpression/check.cmake
index 8ffa481..8745d57 100644
--- a/Tests/GeneratorExpression/check.cmake
+++ b/Tests/GeneratorExpression/check.cmake
@@ -17,6 +17,11 @@ check(test_and_1_0 "0")
 check(test_and_1_1 "1")
 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:


hooks/post-receive
-- 
CMake