]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix: Drop out of the right loop, annotate logic 13019/head
authorMatthias Maier <tamiko@43-1.org>
Mon, 6 Dec 2021 23:45:33 +0000 (17:45 -0600)
committerMatthias Maier <tamiko@43-1.org>
Mon, 6 Dec 2021 23:55:09 +0000 (17:55 -0600)
cmake/macros/macro_deal_ii_pickup_tests.cmake

index 9803eac172620199e1c1109a1242ff49abad9ccf..4a1ef85f73b756825b55a8033007bfc038e83740 100644 (file)
@@ -256,6 +256,7 @@ MACRO(DEAL_II_PICKUP_TESTS)
           # given test
           #
           SET(_skip_test TRUE)
+          CONTINUE() # drop out of "FOREACH(_match ${_matches})"
         ENDIF()
       ENDIF()
 
@@ -275,13 +276,10 @@ Comparison operator \"=\" expected for boolean match.\n"
         IF( (${_variable} AND NOT ${_boolean}) OR
             (NOT ${_variable} AND ${_boolean}) )
           SET(_skip_test TRUE)
+          CONTINUE() # drop out of "FOREACH(_match ${_matches})"
         ENDIF()
       ENDIF()
 
-      IF(_skip_test)
-        CONTINUE()   # next test
-      ENDIF()
-
       #
       # Process version constraints:
       #
@@ -298,11 +296,16 @@ Comparison operator \"=\" expected for boolean match.\n"
               "${DEAL_II_${_feature}_VERSION}" VERSION_LESS "${_version}" ) OR
             ( "${_operator}" STREQUAL ".leq." AND
               "${DEAL_II_${_feature}_VERSION}" VERSION_GREATER "${_version}" ) )
-          CONTINUE()   # next test
+          SET(_skip_test TRUE)
+          CONTINUE() # drop out of "FOREACH(_match ${_matches})"
         ENDIF()
       ENDIF()
     ENDFOREACH()
 
+    IF(_skip_test)
+      CONTINUE() # next test
+    ENDIF()
+
     #
     # We've made it all the way to here, which means that we actually
     # want to define the test

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.