]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Support in tree UMFPACK and AMD builds
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 21:28:17 +0000 (21:28 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 21:28:17 +0000 (21:28 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26760 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/modules/FindAMD.cmake
deal.II/cmake/modules/FindPETSC.cmake
deal.II/cmake/modules/FindUMFPACK.cmake

index b084d2f8d866d341b18a635865d56c586a34d464..d742a723cc79134642cf40c3f701ba064d48b257 100644 (file)
@@ -2,25 +2,25 @@
 # Try to find the AMD library
 #
 
-INCLUDE(FindPackageHandleStandardArgs)
+SET_IF_EMPTY(AMD_DIR "$ENV{AMD_DIR}")
+SET_IF_EMPTY(UMFPACK_DIR "$ENV{UMFPACK_DIR}")
 
 FIND_PATH(AMD_INCLUDE_DIR amd.h
   HINTS
-    ${AMD_DIR}/include
-    $ENV{AMD_DIR}/include
-    ${UMFPACK_DIR}/include
-    $ENV{UMFPACK_DIR}/include
+    ${AMD_DIR}
+    ${UMFPACK_DIR}
+  PATH_SUFFIXES
+    amd include Include AMD/Include ../AMD/Include
 )
 
 FIND_LIBRARY(AMD_LIBRARY
   NAMES amd
   HINTS
     ${AMD_DIR}
-    $ENV{AMD_DIR}
     ${UMFPACK_DIR}
-    $ENV{UMFPACK_DIR}
-  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
-)
+  PATH_SUFFIXES
+    lib${LIB_SUFFIX} lib64 lib Lib AMD/Lib ../AMD/Lib
+  )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(AMD DEFAULT_MSG AMD_LIBRARY AMD_INCLUDE_DIR)
 
@@ -28,6 +28,10 @@ IF(AMD_FOUND)
   MARK_AS_ADVANCED(
     AMD_LIBRARY
     AMD_INCLUDE_DIR
+    AMD_DIR
   )
+ELSE()
+  SET(AMD_DIR "" CACHE STRING
+    "An optional hint to an AMD directory"
+    )
 ENDIF()
-
index 3d71cf56d9304eb168ab9c1423098431df833bd2..6380dffa89efb3960e0799c91a5b448094ce85e9 100644 (file)
 
 INCLUDE(FindPackageHandleStandardArgs)
 
-#
-# To safe some logic, promote environment variables to cmake variables if
-# they are not already set.
-#
 SET_IF_EMPTY(PETSC_DIR "$ENV{PETSC_DIR}")
 SET_IF_EMPTY(PETSC_ARCH "$ENV{PETSC_ARCH}")
 
-
 #
 # Search for the first part of the includes:
 #
index efc2a706c0ee8969c91976c5a1afcd99bdf15924..1b0a01a418ce89db619b59eec5556663a22c8236 100644 (file)
@@ -2,21 +2,23 @@
 # Try to find the UMFPACK library
 #
 
-INCLUDE(FindPackageHandleStandardArgs)
+SET_IF_EMPTY(AMD_DIR "$ENV{AMD_DIR}")
+SET_IF_EMPTY(UMFPACK_DIR "$ENV{UMFPACK_DIR}")
 
 FIND_PATH(UMFPACK_INCLUDE_DIR umfpack.h
   HINTS
-    ${UMFPACK_DIR}/include
-    $ENV{UMFPACK_DIR}/include
-  PATH_SUFFIXES umfpack
+    ${AMD_DIR}
+    ${UMFPACK_DIR}
+  PATH_SUFFIXES
+    umfpack include Include UMFPACK/Include ../UMFPACK/Include
 )
 
 FIND_LIBRARY(UMFPACK_LIBRARY
   NAMES umfpack
   HINTS
     ${UMFPACK_DIR}
-    $ENV{UMFPACK_DIR}
-  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
+  PATH_SUFFIXES
+    lib${LIB_SUFFIX} lib64 lib Lib UMFPACK/Lib ../UMFPACK/Lib
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(UMFPACK DEFAULT_MSG UMFPACK_LIBRARY UMFPACK_INCLUDE_DIR)
@@ -25,6 +27,11 @@ IF(UMFPACK_FOUND)
   MARK_AS_ADVANCED(
     UMFPACK_LIBRARY
     UMFPACK_INCLUDE_DIR
+    UMFPACK_DIR
   )
+ELSE()
+  SET(UMFPACK_DIR "" CACHE STRING
+    "An optional hint to an UMFPACK directory"
+    )
 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.