]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 22:19:25 +0000 (22:19 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 22:19:25 +0000 (22:19 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26868 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 31757333378a310e1fa1a1e4910be206963e56f7..0d5f294660915bb7bbe9ac1c004f6f65e3c4786f 100644 (file)
@@ -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)
index 70c36fe4ad2068d06e8d40feef091709828663a0..a776d410b1eed87cd89364c39df85a0d4483fc22 100644 (file)
@@ -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
index 3ed76c69ef197d31fc38ce64bc86e3a603447e89..f08a925f8acec71d23cae4e3b5b6bff8070d3c11 100644 (file)
@@ -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
   )
 
 

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.