From ca3876fb5c3d58e823f3541df79688e78e206da9 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 28 Sep 2012 22:19:25 +0000 Subject: [PATCH] Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26868 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindAMD.cmake | 6 ++++-- deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake | 10 ++++++---- deal.II/cmake/modules/FindUMFPACK.cmake | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/deal.II/cmake/modules/FindAMD.cmake b/deal.II/cmake/modules/FindAMD.cmake index 3175733337..0d5f294660 100644 --- a/deal.II/cmake/modules/FindAMD.cmake +++ b/deal.II/cmake/modules/FindAMD.cmake @@ -18,8 +18,9 @@ FIND_PATH(AMD_INCLUDE_DIR amd.h HINTS ${AMD_DIR} ${UMFPACK_DIR} + ${UMFPACK_DIR}/../AMD/ PATH_SUFFIXES - amd include/amd include Include AMD/Include ../AMD/Include + amd include/amd include Include AMD/Include ) FIND_LIBRARY(AMD_LIBRARY @@ -27,8 +28,9 @@ FIND_LIBRARY(AMD_LIBRARY HINTS ${AMD_DIR} ${UMFPACK_DIR} + ${UMFPACK_DIR}/../AMD PATH_SUFFIXES - lib${LIB_SUFFIX} lib64 lib Lib AMD/Lib ../AMD/Lib + lib${LIB_SUFFIX} lib64 lib Lib AMD/Lib ) FIND_PACKAGE_HANDLE_STANDARD_ARGS(AMD DEFAULT_MSG AMD_LIBRARY AMD_INCLUDE_DIR) diff --git a/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake b/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake index 70c36fe4ad..a776d410b1 100644 --- a/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake +++ b/deal.II/cmake/modules/FindSUITESPARSECONFIG.cmake @@ -16,19 +16,21 @@ SET_IF_EMPTY(SUITESPARSE_DIR "$ENV{SUITESPARSECONFIG_DIR}") FIND_PATH(SUITESPARSECONFIG_INCLUDE_DIR SuiteSparse_config.h HINTS - ${UMFPACK_DIR} ${SUITESPARSECONFIG_DIR} + ${UMFPACK_DIR} + ${UMFPACK_DIR}/../SuiteSparse_config PATH_SUFFIXES - include SuiteSparse_config ../SuiteSparse_config + include SuiteSparse_config ) FIND_LIBRARY(SUITESPARSECONFIG_LIBRARY NAMES suitesparseconfig HINTS - ${UMFPACK_DIR} ${SUITESPARSECONFIG_DIR} + ${UMFPACK_DIR} + ${UMFPACK_DIR}/../SuiteSparse_config PATH_SUFFIXES - lib${LIB_SUFFIX} lib64 lib SuiteSparse_config ../SuiteSparse_config + lib${LIB_SUFFIX} lib64 lib SuiteSparse_config ) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SUITESPARSECONFIG DEFAULT_MSG diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake index 3ed76c69ef..f08a925f8a 100644 --- a/deal.II/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/cmake/modules/FindUMFPACK.cmake @@ -22,7 +22,7 @@ FIND_PATH(UMFPACK_INCLUDE_DIR umfpack.h HINTS ${UMFPACK_DIR} PATH_SUFFIXES - umfpack include/umfpack include Include UMFPACK/Include ../UMFPACK/Include + umfpack include/umfpack include Include UMFPACK/Include ) FIND_LIBRARY(UMFPACK_LIBRARY @@ -30,7 +30,7 @@ FIND_LIBRARY(UMFPACK_LIBRARY HINTS ${UMFPACK_DIR} PATH_SUFFIXES - lib${LIB_SUFFIX} lib64 lib Lib UMFPACK/Lib ../UMFPACK/Lib + lib${LIB_SUFFIX} lib64 lib Lib UMFPACK/Lib ) -- 2.39.5