From 4f18875c32f69e7c320c208a50948dfe0ce21c07 Mon Sep 17 00:00:00 2001
From: Andreas Naumann <andreas.naumann@tu-dresden.de>
Date: Sat, 5 Mar 2011 07:56:51 +0000
Subject: [PATCH] more blas
---
AMDiS/AMDiSConfig.cmake.in | 10 ++++------
AMDiS/HOWTO_cmake.html | 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/AMDiS/AMDiSConfig.cmake.in b/AMDiS/AMDiSConfig.cmake.in
index 693684ef..e117d735 100644
--- a/AMDiS/AMDiSConfig.cmake.in
+++ b/AMDiS/AMDiSConfig.cmake.in
@@ -63,15 +63,13 @@ set(AMDiS_USE_FILE ${AMDiS_DIR}/AMDiSUse.cmake)
set(AMDiS_COMPILEFLAGS "@COMPILEFLAGS@")
if(AMDiS_NEED_UMFPACK)
- set(BLAS_LIBRARY "blas" CACHE FILEPATH "the blas library")
- find_library(_BLAS_LIB NAMES "${BLAS_LIBRARY}" "goto" PATHS ${BLAS_LIBRARY_DIR})
- message("blaslibrary: ${_BLAS_LIB}")
- if(NOT _BLAS_LIB)
+ find_library(BLAS_LIBRARY NAMES "blas" "goto")
+# message("blaslibrary: ${BLAS_LIBRARY}")
+ if(NOT BLAS_LIBRARY)
message(ERROR " could not find the blas library. please set the variable BLAS_LIBRARY to the blas library with full path")
- else()
- set(BLAS_LIBRARY "${_BLAS_LIB}")
endif()
list(APPEND AMDiS_LIBRARIES ${AMDiS_LIBRARY_DIR}/umfpack/libumfpack.a ${AMDiS_LIBRARY_DIR}/amd/libamd.a ${BLAS_LIBRARY})
+#message("amdis-libs: ${AMDiS_LIBRARIES}")
list(APPEND AMDiS_LIBRARY_DIRS ${AMDiS_LIBRARY_DIR}/umfpack ${AMDiS_LIBRARY_DIR}/amd ${BLAS_LIBRARY_DIR})
list(APPEND AMDiS_INCLUDE_DIRS
${AMDiS_INCLUDE_DIR}/umfpack
diff --git a/AMDiS/HOWTO_cmake.html b/AMDiS/HOWTO_cmake.html
index 1e91dcc3..a5ef31b1 100644
--- a/AMDiS/HOWTO_cmake.html
+++ b/AMDiS/HOWTO_cmake.html
@@ -6,7 +6,7 @@
<h1> Using AMDiS with cmake </h1>
With this short page, I will show you, how to use the cmake buildsystem with AMDiS. The introduction consists of two main parts:
<ol> <li>compiling and installing AMDiS with CMake </li>
-<li> using the cmake-installed AMDiS in your project </li></ol>
+<li> using the cmake installed AMDiS in your project </li></ol>
<h2> Compiling and installing AMDiS with CMake </h2>
<h3> configure </h3>
@@ -44,6 +44,6 @@ The last command will install AMDiS to /home/joe/programs
<a href="#config_with_options" >configuration with options </a>
If you only want to build with standard options, you can simply run
<verbatim> cmake . </verbatim>
-<h2> Using the cmake-installed AMDiS in your project </h2>
+<h2> Using the cmake installed AMDiS in your project </h2>
</body>
</html>
--
GitLab