diff --git a/AMDiS/AMDiSConfig.cmake.in b/AMDiS/AMDiSConfig.cmake.in index 693684efbe7b6bdcceca38a31937f7b5ca1ef654..e117d735defbdb272e39b4cd3811078a0bc770b7 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 1e91dcc305bafd90ff0ae597724de12deca8bfee..a5ef31b1daf3d9627a4b0b24e9a80d7236269070 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>