]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add support for in tree metis
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 21:28:43 +0000 (21:28 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 26 Sep 2012 21:28:43 +0000 (21:28 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26761 0785d39b-7218-0410-832d-ea1e28bc413d

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

index d742a723cc79134642cf40c3f701ba064d48b257..54ef5b781291fd46bbc5993cd48b0810bc1d0beb 100644 (file)
@@ -2,6 +2,8 @@
 # Try to find the AMD library
 #
 
+INCLUDE(FindPackageHandleStandardArgs)
+
 SET_IF_EMPTY(AMD_DIR "$ENV{AMD_DIR}")
 SET_IF_EMPTY(UMFPACK_DIR "$ENV{UMFPACK_DIR}")
 
@@ -10,7 +12,7 @@ FIND_PATH(AMD_INCLUDE_DIR amd.h
     ${AMD_DIR}
     ${UMFPACK_DIR}
   PATH_SUFFIXES
-    amd include Include AMD/Include ../AMD/Include
+    amd include/amd include Include AMD/Include ../AMD/Include
 )
 
 FIND_LIBRARY(AMD_LIBRARY
index ba7357566f5461ee104607f46026229001b516cd..6a0f0ea19a4fd7f25b967235e429bfeaa430c35a 100644 (file)
@@ -4,19 +4,23 @@
 
 INCLUDE(FindPackageHandleStandardArgs)
 
+SET_IF_EMPTY(METIS_DIR "$ENV{METIS_DIR}")
+
 FIND_PATH(METIS_INCLUDE_DIR metis.h
   HINTS
-    ${METIS_DIR}/include
-    $ENV{METIS_DIR}/include
-  PATH_SUFFIXES metis
+    ${METIS_DIR}
+  PATH_SUFFIXES
+    metis include/metis include
   )
 
 FIND_LIBRARY(METIS_LIBRARY
   NAMES metis
   HINTS
     ${METIS_DIR}
-    $ENV{METIS_DIR}
-  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
+  PATH_SUFFIXES
+    lib${LIB_SUFFIX} lib64 lib
+    # This is a hint, isn't it?
+    build/${CMAKE_CXX_PLATFORM_ID}-${CMAKE_SYSTEM_PROCESSOR}/libmetis
   )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(METIS DEFAULT_MSG METIS_LIBRARY METIS_INCLUDE_DIR)
@@ -36,6 +40,11 @@ IF(METIS_FOUND)
   MARK_AS_ADVANCED(
     METIS_LIBRARY
     METIS_INCLUDE_DIR
+    METIS_DIR
   )
+ELSE()
+  SET(METIS_DIR "" CACHE STRING
+    "An optional hint to a metis directory"
+    )
 ENDIF()
 
index 1b0a01a418ce89db619b59eec5556663a22c8236..eacab946d2b70a2fbe108523343ba486bd2e1d18 100644 (file)
@@ -2,6 +2,8 @@
 # Try to find the UMFPACK library
 #
 
+INCLUDE(FindPackageHandleStandardArgs)
+
 SET_IF_EMPTY(AMD_DIR "$ENV{AMD_DIR}")
 SET_IF_EMPTY(UMFPACK_DIR "$ENV{UMFPACK_DIR}")
 
@@ -10,7 +12,7 @@ FIND_PATH(UMFPACK_INCLUDE_DIR umfpack.h
     ${AMD_DIR}
     ${UMFPACK_DIR}
   PATH_SUFFIXES
-    umfpack include Include UMFPACK/Include ../UMFPACK/Include
+    umfpack include/umfpack include Include UMFPACK/Include ../UMFPACK/Include
 )
 
 FIND_LIBRARY(UMFPACK_LIBRARY

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.