From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 13 Nov 2013 22:53:32 +0000 (+0000)
Subject: Bugfix: Filter out spurious "FALSE" in (BLAS|LAPACK)_LIBRARIES
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=729a63920e24839cbbf422761911bd96168059ba;p=dealii-svn.git

Bugfix: Filter out spurious "FALSE" in (BLAS|LAPACK)_LIBRARIES

git-svn-id: https://svn.dealii.org/trunk@31643 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/cmake/configure/configure_1_lapack.cmake b/deal.II/cmake/configure/configure_1_lapack.cmake
index 7c64e0dbe9..65f52b38e8 100644
--- a/deal.II/cmake/configure/configure_1_lapack.cmake
+++ b/deal.II/cmake/configure/configure_1_lapack.cmake
@@ -81,7 +81,6 @@ ENDMACRO()
 
 
 MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL)
-
   ADD_FLAGS(DEAL_II_LINKER_FLAGS "${LAPACK_LINKER_FLAGS}")
   DEAL_II_APPEND_LIBRARIES(${LAPACK_LIBRARIES})
 
diff --git a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
index be470cec36..84b6a37d3f 100644
--- a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
+++ b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
@@ -114,6 +114,14 @@ IF(LAPACK_FOUND)
   ENDFOREACH()
   SWITCH_LIBRARY_PREFERENCE()
 
+  #
+  # Filter out spurious "FALSE" in the library lists:
+  #
+  IF(DEFINED BLAS_LIBRARIES)
+    LIST(REMOVE_ITEM BLAS_LIBRARIES "FALSE")
+  ENDIF()
+  LIST(REMOVE_ITEM LAPACK_LIBRARIES "FALSE")
+
   MARK_AS_ADVANCED(
     BLAS_DIR
     LAPACK_DIR
@@ -130,14 +138,10 @@ ELSE()
     )
 
   #
-  # If we couldn't find LAPACK, clean up the library variables:
+  # Clean up the library variables in case we couldn't find the libraries
+  # to avoid spurious inclusions of "-NOTFOUND" or "FALSE":
   #
-
-  IF("${BLAS_LIBRARIES}" STREQUAL "FALSE")
-    SET(BLAS_LIBRARIES "")
-  ENDIF()
-  IF("${LAPACK_LIBRARIES}" STREQUAL "FALSE")
-    SET(LAPACK_LIBRARIES "")
-  ENDIF()
+  SET(BLAS_LIBRARIES)
+  SET(LAPACK_LIBRARIES)
 
 ENDIF()