From 69639b1079c1a6bd9811ee4cdf802eef511a3c51 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 15 Sep 2012 21:06:59 +0000 Subject: [PATCH] Bugfix: The dependency logic in configure_umfpack.cmake was broken. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26401 0785d39b-7218-0410-832d-ea1e28bc413d --- .../contrib/cmake/configure/configure_umfpack.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/deal.II/contrib/cmake/configure/configure_umfpack.cmake b/deal.II/contrib/cmake/configure/configure_umfpack.cmake index 26145cefba..b75c63286b 100644 --- a/deal.II/contrib/cmake/configure/configure_umfpack.cmake +++ b/deal.II/contrib/cmake/configure/configure_umfpack.cmake @@ -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() -- 2.39.5