[Cmake-commits] [cmake-commits] martink committed CMakeLists.txt 1.70 1.71 cmTestConfigure.h.in 1.24 1.25
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jun 26 13:01:37 EDT 2008
Update of /cvsroot/CMake/CMake/Tests/Complex
In directory public:/mounts/ram/cvs-serv10873/Tests/Complex
Modified Files:
CMakeLists.txt cmTestConfigure.h.in
Log Message:
ENH: support parenthesis as arguments and in conditionals feature request #6191
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/CMakeLists.txt,v
retrieving revision 1.70
retrieving revision 1.71
diff -C 2 -d -r1.70 -r1.71
*** CMakeLists.txt 20 Mar 2008 22:25:59 -0000 1.70
--- CMakeLists.txt 26 Jun 2008 17:01:35 -0000 1.71
***************
*** 337,340 ****
--- 337,346 ----
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.25
diff -C 2 -d -r1.24 -r1.25
*** cmTestConfigure.h.in 19 Oct 2006 18:45:40 -0000 1.24
--- cmTestConfigure.h.in 26 Jun 2008 17:01:35 -0000 1.25
***************
*** 82,83 ****
--- 82,87 ----
// test elseif
#cmakedefine ELSEIF_RESULT
+
+ // test parenthesis in conditionals
+ #cmakedefine CONDITIONAL_PARENTHESES
+
More information about the Cmake-commits
mailing list