[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-877-gb514d8b

[Brad King]

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  b514d8bcc993d7cf516d2d9f3ebf627555ae29e8 (commit)
       via  d124c41168cb509e32a31d09c1008bcb6a3d1d7d (commit)
      from  1253f0f9b971ffea3faea2692af5fe12bc9ce648 (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=b514d8bcc993d7cf516d2d9f3ebf627555ae29e8
commit b514d8bcc993d7cf516d2d9f3ebf627555ae29e8
Merge: 1253f0f d124c41
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 25 14:40:48 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 25 14:40:48 2014 -0500

    Merge topic 'return-test-foreach' into next
    
    d124c411 return: Add test for returning inside a foreach loop


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d124c41168cb509e32a31d09c1008bcb6a3d1d7d
commit d124c41168cb509e32a31d09c1008bcb6a3d1d7d
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Nov 18 16:34:29 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 25 14:37:39 2014 -0500

    return: Add test for returning inside a foreach loop
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c5825fe..8e6bad4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -110,6 +110,7 @@ add_RunCMake_test(include_directories)
 add_RunCMake_test(list)
 add_RunCMake_test(message)
 add_RunCMake_test(project)
+add_RunCMake_test(return)
 add_RunCMake_test(string)
 add_RunCMake_test(try_compile)
 add_RunCMake_test(set)
diff --git a/Tests/RunCMake/return/CMakeLists.txt b/Tests/RunCMake/return/CMakeLists.txt
new file mode 100644
index 0000000..ef2163c
--- /dev/null
+++ b/Tests/RunCMake/return/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.1)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/return/ReturnFromForeach-result.txt b/Tests/RunCMake/return/ReturnFromForeach-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/return/ReturnFromForeach-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/return/ReturnFromForeach.cmake b/Tests/RunCMake/return/ReturnFromForeach.cmake
new file mode 100644
index 0000000..c71cf33
--- /dev/null
+++ b/Tests/RunCMake/return/ReturnFromForeach.cmake
@@ -0,0 +1,10 @@
+function(foo)
+  foreach(i RANGE 1 3)
+    foreach(j RANGE 1 3)
+      return()
+      message(FATAL_ERROR "unexpected")
+    endforeach()
+  endforeach()
+endfunction(foo)
+
+foo()
diff --git a/Tests/RunCMake/return/RunCMakeTest.cmake b/Tests/RunCMake/return/RunCMakeTest.cmake
new file mode 100644
index 0000000..2cc6c9d
--- /dev/null
+++ b/Tests/RunCMake/return/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(ReturnFromForeach)

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                                |    1 +
 Tests/RunCMake/{add_custom_command => return}/CMakeLists.txt |    0
 .../ReturnFromForeach-result.txt}                            |    0
 Tests/RunCMake/return/ReturnFromForeach.cmake                |   10 ++++++++++
 Tests/RunCMake/return/RunCMakeTest.cmake                     |    3 +++
 5 files changed, 14 insertions(+)
 copy Tests/RunCMake/{add_custom_command => return}/CMakeLists.txt (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => return/ReturnFromForeach-result.txt} (100%)
 create mode 100644 Tests/RunCMake/return/ReturnFromForeach.cmake
 create mode 100644 Tests/RunCMake/return/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake