[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2809-gac15300

[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  ac15300136f67a0b15e93f26669b6dc20dfef1ef (commit)
       via  cacb938d312289c5bdf1301c8b955bda7ad3a872 (commit)
      from  392d71e2c31e2b19912e80749b0e16727626a3e8 (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=ac15300136f67a0b15e93f26669b6dc20dfef1ef
commit ac15300136f67a0b15e93f26669b6dc20dfef1ef
Merge: 392d71e cacb938
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 28 08:58:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 28 08:58:32 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cacb938d312289c5bdf1301c8b955bda7ad3a872
commit cacb938d312289c5bdf1301c8b955bda7ad3a872
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:58:09 2013 +0200

    Split the GeneratorExpression test into a third part.
    
    Avoid command lines beyond NMake limits.
    
     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..ab936ca 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required (VERSION 2.8.8)
 project(GeneratorExpression CXX)
 
+# This test is split into multiple parts as needed to avoid NMake command
+# length limits.
+
 add_custom_target(check-part1 ALL
   COMMAND ${CMAKE_COMMAND}
     -Dtest_0=$<0:nothing>
@@ -60,7 +63,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 +133,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:


hooks/post-receive
-- 
CMake