From 3139b8c64f562395d819eade43af054e9966f6c1 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 26 Sep 2012 21:28:43 +0000 Subject: [PATCH] Add support for in tree metis git-svn-id: https://svn.dealii.org/branches/branch_cmake@26761 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindAMD.cmake | 4 +++- deal.II/cmake/modules/FindMETIS.cmake | 19 ++++++++++++++----- deal.II/cmake/modules/FindUMFPACK.cmake | 4 +++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/deal.II/cmake/modules/FindAMD.cmake b/deal.II/cmake/modules/FindAMD.cmake index d742a723cc..54ef5b7812 100644 --- a/deal.II/cmake/modules/FindAMD.cmake +++ b/deal.II/cmake/modules/FindAMD.cmake @@ -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 diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index ba7357566f..6a0f0ea19a 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -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() diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake index 1b0a01a418..eacab946d2 100644 --- a/deal.II/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/cmake/modules/FindUMFPACK.cmake @@ -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 -- 2.39.5