[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3225-g34bd20b

[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  34bd20b0b6d563e3bae8c20dae3c30cbadf2f112 (commit)
       via  b86935125c0d950ec0af1ab7a8a365ad7078b350 (commit)
      from  9dd3cc62fd9766b561431b33852ece78a57d85aa (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=34bd20b0b6d563e3bae8c20dae3c30cbadf2f112
commit 34bd20b0b6d563e3bae8c20dae3c30cbadf2f112
Merge: 9dd3cc6 b869351
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 18 15:06:25 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 18 15:06:25 2013 -0400

    Merge topic 'fix-mapped-config-genex' into next
    
    b869351 Fix test with no config.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b86935125c0d950ec0af1ab7a8a365ad7078b350
commit b86935125c0d950ec0af1ab7a8a365ad7078b350
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 18 21:05:59 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 18 21:05:59 2013 +0200

    Fix test with no config.

diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 0263d4b..40ad65a 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -9,8 +9,14 @@ check(test_version_equal_1 "0")
 check(test_version_equal_2 "1")
 
 foreach(c debug release relwithdebinfo minsizerel)
-  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}}")
+  if(config)
+    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}}")
+    endif()
+  else()
+    if(NOT "${test_imported_${c}}" MATCHES "^;$")
+      message(SEND_ERROR "test_imported_${c} is not correct: ${test_imported_${c}}")
+    endif()
   endif()
 endforeach()

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

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


hooks/post-receive
-- 
CMake