[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.3 1.4

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jul 22 13:42:30 EDT 2009


Update of /cvsroot/CMake/CMake/Tests/FunctionTest/SubDirScope
In directory public:/mounts/ram/cvs-serv7579/Tests/FunctionTest/SubDirScope

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Improve strictness of Function test

The command "set(... PARENT_SCOPE)" should never affect the calling
scope.  This improves the Function test to check that such calls in a
subdirectory scope affect the parent but not the child.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FunctionTest/SubDirScope/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeLists.txt	18 Jan 2008 20:52:54 -0000	1.3
--- CMakeLists.txt	22 Jul 2009 17:42:27 -0000	1.4
***************
*** 1,4 ****
! SET(SUBDIR_DEFINED 1)
! SET(SUBDIR_UNDEFINED)
! SET(SUBDIR_DEFINED ${SUBDIR_DEFINED} PARENT_SCOPE)
! SET(SUBDIR_UNDEFINED ${SUBDIR_UNDEFINED} PARENT_SCOPE)
--- 1,14 ----
! SET(SUBDIR_DEFINED 1 PARENT_SCOPE)
! SET(SUBDIR_UNDEFINED PARENT_SCOPE)
! 
! # The above sets should not affect the current scope.
! IF(DEFINED SUBDIR_UNDEFINED)
!   PASS("SubdirScope Undefine Test" "(${SUBDIR_UNDEFINED})")
! ELSE(DEFINED SUBDIR_UNDEFINED)
!   FAILED("SubdirScope Undefine Test" "(${SUBDIR_UNDEFINED})")
! ENDIF(DEFINED SUBDIR_UNDEFINED)
! IF(DEFINED SUBDIR_DEFINED)
!   FAILED("SubdirScope Define Test" "(${SUBDIR_DEFINED})")
! ELSE(DEFINED SUBDIR_DEFINED)
!   PASS("SubdirScope Define Test" "(${SUBDIR_DEFINED})")
! ENDIF(DEFINED SUBDIR_DEFINED)



More information about the Cmake-commits mailing list