summaryrefslogtreecommitdiffstats
path: root/Tests/Complex
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2008-06-26 17:01:35 (GMT)
committerKen Martin <ken.martin@kitware.com>2008-06-26 17:01:35 (GMT)
commit19e891532a915d1fa4fcf4cdba6254d28c2adc6c (patch)
tree8f128805f9f8e6bcef1bee2a10acf9e4b6e4bc83 /Tests/Complex
parentd8e05b43a1fc0370aa3ac84f4209b1b942809b89 (diff)
downloadCMake-19e891532a915d1fa4fcf4cdba6254d28c2adc6c.zip
CMake-19e891532a915d1fa4fcf4cdba6254d28c2adc6c.tar.gz
CMake-19e891532a915d1fa4fcf4cdba6254d28c2adc6c.tar.bz2
ENH: support parenthesis as arguments and in conditionals feature request #6191
Diffstat (limited to 'Tests/Complex')
-rw-r--r--Tests/Complex/CMakeLists.txt6
-rw-r--r--Tests/Complex/Executable/complex.cxx6
-rw-r--r--Tests/Complex/cmTestConfigure.h.in4
3 files changed, 16 insertions, 0 deletions
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 1814528..c3f94b7 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -336,6 +336,12 @@ if (NOT ELSEIF_RESULT EQUAL 2)
set (ELSEIF_RESULT 0)
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
# (plug vars to #define so that they can be tested)
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index 95e77b6..0ecd8fe 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -369,6 +369,12 @@ int main()
cmFailed("ELSEIF did not work");
#endif
+#ifdef CONDITIONAL_PARENTHESES
+ cmPassed("CONDITIONAL_PARENTHESES did work");
+#else
+ cmFailed("CONDITIONAL_PARENTHESES did not work");
+#endif
+
if(file2() != 1)
{
cmFailed("Call to file2 function from library failed.");
diff --git a/Tests/Complex/cmTestConfigure.h.in b/Tests/Complex/cmTestConfigure.h.in
index 8034203..d7952da 100644
--- a/Tests/Complex/cmTestConfigure.h.in
+++ b/Tests/Complex/cmTestConfigure.h.in
@@ -81,3 +81,7 @@
// test elseif
#cmakedefine ELSEIF_RESULT
+
+// test parenthesis in conditionals
+#cmakedefine CONDITIONAL_PARENTHESES
+