CMake: Add LAPACK/BLAS to the link interface of p4est

git-svn-id: https://svn.dealii.org/trunk@29985 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 04ddb713585eab98f433f1d42f6a430a142789ca..178fe501d28e7c5baa6ca12d6b5d27ed79c1bb8c 100644 (file)
--- a/deal.II/cmake/configure/configure_1_lapack.cmake
+++ b/deal.II/cmake/configure/configure_1_lapack.cmake
@@ -37,26 +37,25 @@ MACRO(FEATURE_LAPACK_FIND_EXTERNAL var)
     LIST(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})
   ENDIF()
 
-  #
-  # Well, in case of static archives we have to manually pick up the
-  # complete link interface. *sigh*
-  #
-  # Do this unconditionally for the most common case:
-  # TODO: Non-GNU setups...
-  #
-  FOREACH(_lib gfortran m quadmath)
-    FIND_LIBRARY(${_lib}_lib
-      NAMES ${_lib}
-      HINTS ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
-    MARK_AS_ADVANCED(${_lib}_lib)
-
-    IF(NOT ${_lib}_lib MATCHES "-NOTFOUND")
-      LIST(APPEND LAPACK_LIBRARIES ${${_lib}_lib})
-    ENDIF()
-  ENDFOREACH()
-
-
   IF(LAPACK_FOUND)
+    #
+    # Well, in case of static archives we have to manually pick up the
+    # complete link interface. *sigh*
+    #
+    # Do this unconditionally for the most common case:
+    # TODO: Non-GNU setups...
+    #
+    FOREACH(_lib gfortran m quadmath)
+      FIND_LIBRARY(${_lib}_lib
+        NAMES ${_lib}
+        HINTS ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
+      MARK_AS_ADVANCED(${_lib}_lib)
+
+      IF(NOT ${_lib}_lib MATCHES "-NOTFOUND")
+        LIST(APPEND LAPACK_LIBRARIES ${${_lib}_lib})
+      ENDIF()
+    ENDFOREACH()
+
     MARK_AS_ADVANCED(
       atlas_LIBRARY
       blas_LIBRARY

diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake
index 1ea765df015ad72ef935f40127229bf1767f7258..bdbb8ad4c217405f746ef712a98b02a0b68c73b5 100644 (file)
--- a/deal.II/cmake/modules/FindP4EST.cmake
+++ b/deal.II/cmake/modules/FindP4EST.cmake
@@ -93,6 +93,7 @@ IF(P4EST_FOUND)
   SET(P4EST_LIBRARIES
     ${P4EST_LIBRARY}
     ${SC_LIBRARY}
+    ${LAPACK_LIBRARIES} # for good measure
     ${MPI_C_LIBRARIES} # for good measure
     )
   SET(P4EST_INCLUDE_DIRS