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 7c64e0dbe989682f520d1e3e0c17f7b7b733b256..65f52b38e827e04d41389d903906af501555765c 100644 (file)
--- 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 be470cec36a9a63ad17f3a259ba113b500f1000c..84b6a37d3f633edd17fd5dea7b8c486bf0520365 100644 (file)
--- 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()