]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
configure_arpack.cmake and FindARPACK.cmake done
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 12:15:26 +0000 (12:15 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 12:15:26 +0000 (12:15 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26827 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_arpack.cmake
deal.II/cmake/modules/FindARPACK.cmake

index 537d83bc9b71ae8e4a648f472a02ec0bd42d969b..31b7dbd4124f50c16e947e2546a09a226e26045b 100644 (file)
@@ -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)
 
index 48bac430874ac46e956b320ec2ab10cefba10e7c..a06eb965d1e457b36e1e595e2303f59b2bb14836 100644 (file)
@@ -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()

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.