[Cmake-commits] CMake branch, next, updated. v2.8.9-1109-gd4de6c1

[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  d4de6c1ddfd1c7daf51a33a58720c7926b60baf2 (commit)
       via  4a7d2e7dee8da5894b25818d1870d8480fe9241e (commit)
      from  ba089c0be44c52fad406578bd08879a2c2ef5f99 (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=d4de6c1ddfd1c7daf51a33a58720c7926b60baf2
commit d4de6c1ddfd1c7daf51a33a58720c7926b60baf2
Merge: ba089c0 4a7d2e7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 16 09:28:13 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 16 09:28:13 2012 -0400

    Merge topic 'generator-expression-bug-fixes' into next
    
    4a7d2e7 Replace some failing tests with Borland and NMake makefiles.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a7d2e7dee8da5894b25818d1870d8480fe9241e
commit 4a7d2e7dee8da5894b25818d1870d8480fe9241e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 16 00:22:18 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 16 15:26:06 2012 +0200

    Replace some failing tests with Borland and NMake makefiles.
    
    The '<<' is a special sequence on those platforms, so it can't appear in
    the test.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index cb01ec1..891fa11 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -62,15 +62,14 @@ add_custom_target(check ALL
     -Dtest_incomplete_11=$<something,,
     -Dtest_incomplete_12=$<,,
     -Dtest_incomplete_13=$<some$<1:special>thing
-    -Dtest_incomplete_14=$<<something
+    -Dtest_incomplete_14=$<$<ANGLE-R>
     -Dtest_incomplete_15=$<some$<thing
-    -Dtest_incomplete_16=$<<some$<thing
+    -Dtest_incomplete_16=$<BOOL:something
     -Dtest_incomplete_17=$<1:some$thing>
     -Dtest_incomplete_18=$<1:some,thing
     -Dtest_incomplete_19=$<1:some,thing$<ANGLE-R>
     -Dtest_incomplete_20=$<CONFIGURATION$<ANGLE-R>
     -Dtest_incomplete_21=$<BOOL:something$<ANGLE-R>
-    -Dtest_incomplete_22=$<BOOL:something
     -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake
   COMMAND ${CMAKE_COMMAND} -E echo "check done"
   VERBATIM
diff --git a/Tests/GeneratorExpression/check.cmake b/Tests/GeneratorExpression/check.cmake
index bfdbd65..8ffa481 100644
--- a/Tests/GeneratorExpression/check.cmake
+++ b/Tests/GeneratorExpression/check.cmake
@@ -63,12 +63,11 @@ check(test_incomplete_10 "$<something:,:")
 check(test_incomplete_11 "$<something,,")
 check(test_incomplete_12 "$<,,")
 check(test_incomplete_13 "$<somespecialthing")
-check(test_incomplete_14 "$<<something")
+check(test_incomplete_14 "$<>")
 check(test_incomplete_15 "$<some$<thing")
-check(test_incomplete_16 "$<<some$<thing")
+check(test_incomplete_16 "$<BOOL:something")
 check(test_incomplete_17 "some$thing")
 check(test_incomplete_18 "$<1:some,thing")
 check(test_incomplete_19 "$<1:some,thing>")
 check(test_incomplete_20 "$<CONFIGURATION>")
 check(test_incomplete_21 "$<BOOL:something>")
-check(test_incomplete_22 "$<BOOL:something")

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

Summary of changes:
 Tests/GeneratorExpression/CMakeLists.txt |    5 ++---
 Tests/GeneratorExpression/check.cmake    |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake