[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2804-gbe280eb

[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  be280ebc30205e9bfd9e3457e5518e6cb7e0dbc2 (commit)
       via  dd151a890eb2eda5f585997f77eb6c527fe2bb23 (commit)
      from  870623528a411bbb671c5060d8cb1846ac9e0e5e (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=be280ebc30205e9bfd9e3457e5518e6cb7e0dbc2
commit be280ebc30205e9bfd9e3457e5518e6cb7e0dbc2
Merge: 8706235 dd151a8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 28 08:52:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 28 08:52:05 2013 -0400

    Merge topic 'version-compare-genex' into next
    
    dd151a8 Split the GeneratorExpression test into a third part.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd151a890eb2eda5f585997f77eb6c527fe2bb23
commit dd151a890eb2eda5f585997f77eb6c527fe2bb23
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 28 14:49:24 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jun 28 14:49:24 2013 +0200

    Split the GeneratorExpression test into a third part.
    
     http://open.cdash.org/testDetails.php?test=196577461&build=2949683
     expanded command line '...' too long

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index e2fc353..f938fa3 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -60,7 +60,7 @@ add_custom_target(check-part1 ALL
     -Dtest_colons_4=$<1:C:\\CMake>
     -Dtest_colons_5=$<1:C:/CMake>
     -P ${CMAKE_CURRENT_SOURCE_DIR}/check-part1.cmake
-  COMMAND ${CMAKE_COMMAND} -E echo "check done (part 1 of 2)"
+  COMMAND ${CMAKE_COMMAND} -E echo "check done (part 1 of 3)"
   VERBATIM
   )
 
@@ -130,13 +130,20 @@ add_custom_target(check-part2 ALL
     -Dtest_arbitrary_content_comma_8=$<1:a,,b>
     -Dtest_arbitrary_content_comma_9=$<1:a,,b,,>
     -Dtest_arbitrary_content_comma_10=$<1:,,a,,b,,>
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/check-part2.cmake
+  COMMAND ${CMAKE_COMMAND} -E echo "check done (part 2 of 3)"
+  VERBATIM
+)
+
+add_custom_target(check-part3 ALL
+  COMMAND ${CMAKE_COMMAND}
     -Dtest_version_greater_1=$<VERSION_GREATER:1.0,1.1.1>
     -Dtest_version_greater_2=$<VERSION_GREATER:1.1.1,1.0>
     -Dtest_version_less_1=$<VERSION_LESS:1.1.1,1.0>
     -Dtest_version_less_2=$<VERSION_LESS:1.0,1.1.1>
     -Dtest_version_equal_1=$<VERSION_EQUAL:1.0.1,1.1>
     -Dtest_version_equal_2=$<VERSION_EQUAL:1.1,1.1>
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/check-part2.cmake
-  COMMAND ${CMAKE_COMMAND} -E echo "check done (part 2 of 2)"
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/check-part3.cmake
+  COMMAND ${CMAKE_COMMAND} -E echo "check done (part 3 of 3)"
   VERBATIM
   )
diff --git a/Tests/GeneratorExpression/check-part2.cmake b/Tests/GeneratorExpression/check-part2.cmake
index f9b33b3..a1db5f6 100644
--- a/Tests/GeneratorExpression/check-part2.cmake
+++ b/Tests/GeneratorExpression/check-part2.cmake
@@ -44,9 +44,3 @@ check(test_arbitrary_content_comma_7 ",,a")
 check(test_arbitrary_content_comma_8 "a,,b")
 check(test_arbitrary_content_comma_9 "a,,b,,")
 check(test_arbitrary_content_comma_10 ",,a,,b,,")
-check(test_version_greater_1 "0")
-check(test_version_greater_2 "1")
-check(test_version_less_1 "0")
-check(test_version_less_2 "1")
-check(test_version_equal_1 "0")
-check(test_version_equal_2 "1")
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
new file mode 100644
index 0000000..70d6571
--- /dev/null
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -0,0 +1,9 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/check-common.cmake)
+
+check(test_version_greater_1 "0")
+check(test_version_greater_2 "1")
+check(test_version_less_1 "0")
+check(test_version_less_2 "1")
+check(test_version_equal_1 "0")
+check(test_version_equal_2 "1")

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

Summary of changes:
 Tests/GeneratorExpression/CMakeLists.txt    |   13 ++++++++++---
 Tests/GeneratorExpression/check-part2.cmake |    6 ------
 Tests/GeneratorExpression/check-part3.cmake |    9 +++++++++
 3 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 Tests/GeneratorExpression/check-part3.cmake


hooks/post-receive
-- 
CMake