]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 13 Sep 2012 12:07:37 +0000 (12:07 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 13 Sep 2012 12:07:37 +0000 (12:07 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26348 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/configure/configure_umfpack.cmake

index 3be086f0b41712c31ad89894fab356988627cd75..5e8539a04bdf25a80e9c99ad0be3a0e19c295ade 100644 (file)
@@ -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()

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.