]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: The dependency logic in configure_umfpack.cmake was broken.
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 15 Sep 2012 21:06:59 +0000 (21:06 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 15 Sep 2012 21:06:59 +0000 (21:06 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26401 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/configure/configure_umfpack.cmake

index 26145cefbab075ec8591c3a9cd37f9cd0e702019..b75c63286b7108e11536750f160c1928e3dddd57 100644 (file)
@@ -80,6 +80,9 @@ ENDMACRO()
 #
 # UMFPACK needs BLAS and LAPACK to be configured:
 #
+# TODO: Encapsulate this in a depend logic and migrate this check into the
+# macro
+
 IF(DEAL_II_WITH_BLAS AND DEAL_II_WITH_LAPACK)
   CONFIGURE_FEATURE(UMFPACK)
 ELSE()
@@ -89,8 +92,10 @@ ELSE()
       )
     SET_CACHED_OPTION(DEAL_II_WITH_UMFPACK OFF)
   ELSE()
-    MESSAGE(SEND_ERROR
-      "DEAL_II_WITH_UMFPACK has unmet configuration requirements: Both, DEAL_II_WITH_BLAS and DEAL_II_WITH_LAPACK have to be set."
-      )
+    IF(DEA_II_WITH_UMFPACK)
+      MESSAGE(SEND_ERROR
+        "DEAL_II_WITH_UMFPACK has unmet configuration requirements: Both, DEAL_II_WITH_BLAS and DEAL_II_WITH_LAPACK have to be set."
+        )
+    ENDIF()
   ENDIF()
 ENDIF()

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.