Commit 4f18875c authored by Naumann, Andreas's avatar Naumann, Andreas
Browse files

more blas

parent 0c596622
...@@ -63,15 +63,13 @@ set(AMDiS_USE_FILE ${AMDiS_DIR}/AMDiSUse.cmake) ...@@ -63,15 +63,13 @@ set(AMDiS_USE_FILE ${AMDiS_DIR}/AMDiSUse.cmake)
set(AMDiS_COMPILEFLAGS "@COMPILEFLAGS@") set(AMDiS_COMPILEFLAGS "@COMPILEFLAGS@")
if(AMDiS_NEED_UMFPACK) if(AMDiS_NEED_UMFPACK)
set(BLAS_LIBRARY "blas" CACHE FILEPATH "the blas library") find_library(BLAS_LIBRARY NAMES "blas" "goto")
find_library(_BLAS_LIB NAMES "${BLAS_LIBRARY}" "goto" PATHS ${BLAS_LIBRARY_DIR}) # message("blaslibrary: ${BLAS_LIBRARY}")
message("blaslibrary: ${_BLAS_LIB}") if(NOT BLAS_LIBRARY)
if(NOT _BLAS_LIB)
message(ERROR " could not find the blas library. please set the variable BLAS_LIBRARY to the blas library with full path") 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() endif()
list(APPEND AMDiS_LIBRARIES ${AMDiS_LIBRARY_DIR}/umfpack/libumfpack.a ${AMDiS_LIBRARY_DIR}/amd/libamd.a ${BLAS_LIBRARY}) 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_LIBRARY_DIRS ${AMDiS_LIBRARY_DIR}/umfpack ${AMDiS_LIBRARY_DIR}/amd ${BLAS_LIBRARY_DIR})
list(APPEND AMDiS_INCLUDE_DIRS list(APPEND AMDiS_INCLUDE_DIRS
${AMDiS_INCLUDE_DIR}/umfpack ${AMDiS_INCLUDE_DIR}/umfpack
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<h1> Using AMDiS with cmake </h1> <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: 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> <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> <h2> Compiling and installing AMDiS with CMake </h2>
<h3> configure </h3> <h3> configure </h3>
...@@ -44,6 +44,6 @@ The last command will install AMDiS to /home/joe/programs ...@@ -44,6 +44,6 @@ The last command will install AMDiS to /home/joe/programs
<a href="#config_with_options" >configuration with options </a> <a href="#config_with_options" >configuration with options </a>
If you only want to build with standard options, you can simply run If you only want to build with standard options, you can simply run
<verbatim> cmake . </verbatim> <verbatim> cmake . </verbatim>
<h2> Using the cmake-installed AMDiS in your project </h2> <h2> Using the cmake installed AMDiS in your project </h2>
</body> </body>
</html> </html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment