From: Matthias Maier Date: Tue, 13 Aug 2013 02:55:42 +0000 (+0000) Subject: CMake: Export LAPACK_DIR and BLAS_DIR if they are needed X-Git-Tag: v8.1.0~1076 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=047e7402ff5d7152587dc5b2501d2b74068d1686;p=dealii.git CMake: Export LAPACK_DIR and BLAS_DIR if they are needed git-svn-id: https://svn.dealii.org/trunk@30298 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake index 131981c8dd..b1c7630265 100644 --- a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake +++ b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake @@ -50,6 +50,17 @@ FIND_PACKAGE(LAPACK) SET(CMAKE_PREFIX_PATH ${_cmake_prefix_path_backup}) +MARK_AS_ADVANCED( + atlas_LIBRARY + blas_LIBRARY + gslcblas_LIBRARY + lapack_LIBRARY + m_LIBRARY + ptf77blas_LIBRARY + ptlapack_LIBRARY + refblas_LIBRARY + reflapack_LIBRARY + ) IF(LAPACK_FOUND) @@ -73,18 +84,6 @@ IF(LAPACK_FOUND) LIST(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES}) ENDIF() - MARK_AS_ADVANCED( - atlas_LIBRARY - blas_LIBRARY - gslcblas_LIBRARY - lapack_LIBRARY - m_LIBRARY - ptf77blas_LIBRARY - ptlapack_LIBRARY - refblas_LIBRARY - reflapack_LIBRARY - ) - # # Well, in case of static archives we have to manually pick up the # complete link interface. *sigh* @@ -110,9 +109,21 @@ IF(LAPACK_FOUND) ENDFOREACH() SWITCH_LIBRARY_PREFERENCE() + MARK_AS_ADVANCED( + BLAS_DIR + LAPACK_DIR + ) + ELSE() SET(DEALII_LAPACK_FOUND FALSE) + SET(LAPACK_DIR "" CACHE PATH + "An optional hint to a LAPACK installation" + ) + SET(BLAS_DIR "" CACHE PATH + "An optional hint to a BLAS installation" + ) + # # If we couldn't find LAPACK, clean up the library variables: #