[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.69.2.4 1.69.2.5 cmTestConfigure.h.in 1.24 1.24.10.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Complex
In directory public:/mounts/ram/cvs-serv25234/Tests/Complex

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt cmTestConfigure.h.in 
Log Message:
ENH: merge in changes for 2.6.3 RC 1


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/CMakeLists.txt,v
retrieving revision 1.69.2.4
retrieving revision 1.69.2.5
diff -C 2 -d -r1.69.2.4 -r1.69.2.5
*** CMakeLists.txt	3 Sep 2008 13:43:23 -0000	1.69.2.4
--- CMakeLists.txt	24 Oct 2008 15:18:56 -0000	1.69.2.5
***************
*** 342,345 ****
--- 342,351 ----
  endif (NOT ELSEIF_RESULT EQUAL 2)
  
+ # test handling of parenthetical groups in conditionals
+ if (2 GREATER 1 AND (4 LESS 3 OR 5 LESS 6) AND NOT (7 GREATER 8))
+   set(CONDITIONAL_PARENTHESES 1)
+ endif()
+ 
+ 
  #
  # Configure file 

Index: cmTestConfigure.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/cmTestConfigure.h.in,v
retrieving revision 1.24
retrieving revision 1.24.10.1
diff -C 2 -d -r1.24 -r1.24.10.1
*** cmTestConfigure.h.in	19 Oct 2006 18:45:40 -0000	1.24
--- cmTestConfigure.h.in	24 Oct 2008 15:18:56 -0000	1.24.10.1
***************
*** 82,83 ****
--- 82,87 ----
  // test elseif
  #cmakedefine ELSEIF_RESULT
+ 
+ // test parenthesis in conditionals
+ #cmakedefine CONDITIONAL_PARENTHESES
+