[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.1.2.1 1.1.2.2 include_return.cmake NONE 1.1.2.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/ReturnTest
In directory public:/mounts/ram/cvs-serv18450/Tests/ReturnTest

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Added Files:
      Tag: CMake-2-6
	include_return.cmake 
Log Message:
ENH: 2.6.2 rc 2 merge from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ReturnTest/CMakeLists.txt,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** CMakeLists.txt	25 Mar 2008 23:59:31 -0000	1.1.2.1
--- CMakeLists.txt	3 Sep 2008 13:43:30 -0000	1.1.2.2
***************
*** 85,88 ****
--- 85,96 ----
  endif ("${subdirResult}" EQUAL 1)
  
+ # check return from a file
+ include(include_return.cmake)
+ if ("${include_returnResult}" EQUAL 1)
+   pass ("include_return")
+ else ("${include_returnResult}" EQUAL 1)
+   failed ("include_return got: ${include_returnResult}")
+ endif ("${include_returnResult}" EQUAL 1)
+ 
  # check return from within a macro
  macro (mymacro)

--- NEW FILE: include_return.cmake ---
set(include_returnResult 1)
return()
set(include_returnResult 0)