From 16ade0f96a301b81219f318a544fdb14936a3395 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 13 Sep 2012 12:07:37 +0000 Subject: [PATCH] Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26348 0785d39b-7218-0410-832d-ea1e28bc413d --- .../cmake/configure/configure_umfpack.cmake | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/deal.II/contrib/cmake/configure/configure_umfpack.cmake b/deal.II/contrib/cmake/configure/configure_umfpack.cmake index 3be086f0b4..5e8539a04b 100644 --- a/deal.II/contrib/cmake/configure/configure_umfpack.cmake +++ b/deal.II/contrib/cmake/configure/configure_umfpack.cmake @@ -1,8 +1,17 @@ FIND_PACKAGE(LAPACK REQUIRED) FIND_PACKAGE(BLAS REQUIRED) +SET(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" + ) + +LIST(APPEND deal_ii_external_libraries + ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} + ) + # TODO: A deal.II specific error message if blas or lapack is not found + IF(NOT DEAL_II_FORCE_CONTRIB_UMFPACK) FIND_PACKAGE(UMFPACK) @@ -24,7 +33,6 @@ IF(UMFPACK_FOUND AND AMD_FOUND) # TODO ELSE() SET(UMFPACKAMD_FOUND FALSE) ENDIF() - IF(DEAL_II_FORCE_CONTRIB_UMFPACK OR NOT UMFPACKAMD_FOUND) INCLUDE_DIRECTORIES( @@ -49,12 +57,8 @@ ELSE() INCLUDE_DIRECTORIES(${UMFPACK_INCLUDE_DIR} ${AMD_INCLUDE_DIR}) - LIST(APPEND deal_ii_required_linker_flags - ${BLAS_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS} - ) - LIST(APPEND deal_ii_external_libraries - ${UMFPACK_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} + ${UMFPACK_LIBRARY} ${AMD_LIBRARY} ) ENDIF() -- 2.39.5