[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2807-g392d71e

[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  392d71e2c31e2b19912e80749b0e16727626a3e8 (commit)
       via  1dcbfc634b323bcc96d932d41fabdea26cde78f2 (commit)
       via  be111246dd750f69b7def732219908edcc9cfd9c (commit)
      from  be280ebc30205e9bfd9e3457e5518e6cb7e0dbc2 (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=392d71e2c31e2b19912e80749b0e16727626a3e8
commit 392d71e2c31e2b19912e80749b0e16727626a3e8
Merge: be280eb 1dcbfc6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 28 08:58:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 28 08:58:00 2013 -0400

    Merge topic 'version-compare-genex' into next
    
    1dcbfc6 Add explanatory comment.
    be11124 Split the GeneratorExpression test into a third part.


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

    Add explanatory comment.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index f938fa3..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>

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be111246dd750f69b7def732219908edcc9cfd9c
commit be111246dd750f69b7def732219908edcc9cfd9c
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:55:10 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..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 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake