[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3239-g8e30b4b

[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  8e30b4b6d66d274ec72022254c97f562a2463156 (commit)
       via  4b7dcfb9745644711709ed41daebc5626375b61b (commit)
      from  ee83d29bdbc4943f6e496bc9d1d90b3c07a0ec5f (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=8e30b4b6d66d274ec72022254c97f562a2463156
commit 8e30b4b6d66d274ec72022254c97f562a2463156
Merge: ee83d29 4b7dcfb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 19 03:00:48 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 19 03:00:48 2013 -0400

    Merge topic 'fix-mapped-config-genex' into next
    
    4b7dcfb Handle NoConfig case.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b7dcfb9745644711709ed41daebc5626375b61b
commit 4b7dcfb9745644711709ed41daebc5626375b61b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 19 08:59:46 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 19 08:59:46 2013 +0200

    Handle NoConfig case.

diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 25f5030..af290a5 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -9,7 +9,7 @@ check(test_version_equal_1 "0")
 check(test_version_equal_2 "1")
 
 foreach(c debug release relwithdebinfo minsizerel)
-  if(config)
+  if(config AND NOT config STREQUAL NoConfig)
     if(NOT "${test_imported_${c}}" MATCHES "^;/imported2/include$"
         AND NOT "${test_imported_${c}}" MATCHES "^/imported1/include;$")
       message(SEND_ERROR "test_imported_${c} is not correct: ${test_imported_${c}}")

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

Summary of changes:
 Tests/GeneratorExpression/check-part3.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake