From: maier Date: Fri, 28 Sep 2012 12:15:26 +0000 (+0000) Subject: configure_arpack.cmake and FindARPACK.cmake done X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d4664599b63708e47cce8206e5570736cbc081c;p=dealii-svn.git configure_arpack.cmake and FindARPACK.cmake done git-svn-id: https://svn.dealii.org/branches/branch_cmake@26827 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_arpack.cmake b/deal.II/cmake/configure/configure_arpack.cmake index 537d83bc9b..31b7dbd412 100644 --- a/deal.II/cmake/configure/configure_arpack.cmake +++ b/deal.II/cmake/configure/configure_arpack.cmake @@ -12,8 +12,9 @@ ENDMACRO() MACRO(FEATURE_ARPACK_CONFIGURE_EXTERNAL var) - INCLUDE_DIRECTORIES(${ARPACK_INCLUDE_DIR}) - LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ARPACK_LIBRARY}) + + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ARPACK_LIBRARIES}) + ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${ARPACK_LINKER_FLAGS}") SET(DEAL_II_USE_ARPACK TRUE) diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake index 48bac43087..a06eb965d1 100644 --- a/deal.II/cmake/modules/FindARPACK.cmake +++ b/deal.II/cmake/modules/FindARPACK.cmake @@ -1,18 +1,45 @@ # # Try to find the ARPACK library # +# This module exports +# +# ARPACK_LIBRARIES +# +# ARPACK_LINKER_FLAGS +# INCLUDE(FindPackageHandleStandardArgs) +# +# ARPACK needs LAPACK and BLAS as dependency, search for them with the help +# of the LAPACK find module: +# +FIND_PACKAGE(LAPACK) + FIND_LIBRARY(ARPACK_LIBRARY NAMES arpack PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib ) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG ARPACK_LIBRARY) +SET(ARPACK_LIBRARIES + ${ARPACK_LIBRARY} + ${LAPACK_LIBRARIES} + ) + +SET(ARPACK_LINKER_FLAGS + ${LAPACK_LINKER_FLAGS} + ) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG + ARPACK_LIBRARY + LAPACK_LIBRARIES + ) IF(ARPACK_FOUND) MARK_AS_ADVANCED( + lapack_LIBRARY + atlas_LIBRARY + blas_LIBRARY ARPACK_LIBRARY ) ENDIF()