From: maier Date: Mon, 17 Sep 2012 18:09:12 +0000 (+0000) Subject: Bugfix. *cough* *cough* X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a4ed0e36bb0f9c330c0cbd1fb11a358beede64f;p=dealii-svn.git Bugfix. *cough* *cough* git-svn-id: https://svn.dealii.org/branches/branch_cmake@26441 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/cmake/configure/configure_blas.cmake b/deal.II/contrib/cmake/configure/configure_blas.cmake index 71a4db091d..3f12dc282d 100644 --- a/deal.II/contrib/cmake/configure/configure_blas.cmake +++ b/deal.II/contrib/cmake/configure/configure_blas.cmake @@ -25,33 +25,6 @@ MACRO(FEATURE_BLAS_CONFIGURE_EXTERNAL var) ${BLAS_LIBRARIES} ) - LIST(APPEND CMAKE_REQUIRED_LIBRARIES "${BLAS_LIBRARIES}") - LIST(APPEND CMAKE_REQUIRED_FLAGS "${BLAS_LINKER_FLAGS}") - - # - # TODO: Reduce to the really necessary parts. - # - CHECK_FUNCTION_EXISTS(daxpy_ HAVE_DAXPY_) - CHECK_FUNCTION_EXISTS(dgeevx_ HAVE_DGEEVX_) - CHECK_FUNCTION_EXISTS(dgeev_ AVE_DGEEV_) - CHECK_FUNCTION_EXISTS(dgelsd_ HAVE_DGELSD_) - CHECK_FUNCTION_EXISTS(dgemm_ AVE_DGEMM_) - CHECK_FUNCTION_EXISTS(dgemv_ AVE_DGEMV_) - CHECK_FUNCTION_EXISTS(dgeqrf_ HAVE_DGEQRF_) - CHECK_FUNCTION_EXISTS(dgesdd_ HAVE_DGESDD_) - CHECK_FUNCTION_EXISTS(dgesvd_ HAVE_DGESVD_) - CHECK_FUNCTION_EXISTS(dgetrf_ HAVE_DGETRF_) - CHECK_FUNCTION_EXISTS(dgetri_ HAVE_DGETRI_) - CHECK_FUNCTION_EXISTS(dgetrs_ HAVE_DGETRS_) - CHECK_FUNCTION_EXISTS(dorgqr_ HAVE_DORGQR_) - CHECK_FUNCTION_EXISTS(dormqr_ HAVE_DORMQR_) - CHECK_FUNCTION_EXISTS(dstev_ AVE_DSTEV_) - CHECK_FUNCTION_EXISTS(dsyevx_ HAVE_DSYEVX_) - CHECK_FUNCTION_EXISTS(dsygvx_ HAVE_DSYGVX_) - - LIST(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${BLAS_LIBRARIES}") - LIST(REMOVE_ITEM CMAKE_REQUIRED_FLAGS "${BLAS_LINKER_FLAGS}") - SET(HAVE_LIBBLAS TRUE) SET(${var} TRUE) diff --git a/deal.II/contrib/cmake/configure/configure_lapack.cmake b/deal.II/contrib/cmake/configure/configure_lapack.cmake index 532f5a8c27..bfe389a6f5 100644 --- a/deal.II/contrib/cmake/configure/configure_lapack.cmake +++ b/deal.II/contrib/cmake/configure/configure_lapack.cmake @@ -29,6 +29,24 @@ MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL var) # # TODO: Reduce to the really necessary parts. # + CHECK_FUNCTION_EXISTS(daxpy_ HAVE_DAXPY_) + CHECK_FUNCTION_EXISTS(dgeevx_ HAVE_DGEEVX_) + CHECK_FUNCTION_EXISTS(dgeev_ AVE_DGEEV_) + CHECK_FUNCTION_EXISTS(dgelsd_ HAVE_DGELSD_) + CHECK_FUNCTION_EXISTS(dgemm_ AVE_DGEMM_) + CHECK_FUNCTION_EXISTS(dgemv_ AVE_DGEMV_) + CHECK_FUNCTION_EXISTS(dgeqrf_ HAVE_DGEQRF_) + CHECK_FUNCTION_EXISTS(dgesdd_ HAVE_DGESDD_) + CHECK_FUNCTION_EXISTS(dgesvd_ HAVE_DGESVD_) + CHECK_FUNCTION_EXISTS(dgetrf_ HAVE_DGETRF_) + CHECK_FUNCTION_EXISTS(dgetri_ HAVE_DGETRI_) + CHECK_FUNCTION_EXISTS(dgetrs_ HAVE_DGETRS_) + CHECK_FUNCTION_EXISTS(dorgqr_ HAVE_DORGQR_) + CHECK_FUNCTION_EXISTS(dormqr_ HAVE_DORMQR_) + CHECK_FUNCTION_EXISTS(dstev_ AVE_DSTEV_) + CHECK_FUNCTION_EXISTS(dsyevx_ HAVE_DSYEVX_) + CHECK_FUNCTION_EXISTS(dsygvx_ HAVE_DSYGVX_) + CHECK_FUNCTION_EXISTS(saxpy_ HAVE_SAXPY_) CHECK_FUNCTION_EXISTS(sgeevx_ HAVE_SGEEVX_) CHECK_FUNCTION_EXISTS(sgeev_ HAVE_SGEEV_) @@ -46,6 +64,7 @@ MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL var) CHECK_FUNCTION_EXISTS(sstev_ HAVE_SSTEV_) CHECK_FUNCTION_EXISTS(ssyevx_ HAVE_SSYEVX_) CHECK_FUNCTION_EXISTS(ssygvx_ HAVE_SSYGVX_) + CHECK_FUNCTION_EXISTS(strtrs_ HAVE_STRTRS_) LIST(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${LAPACK_LIBRARIES}") diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 75b5486e49..da99e9328d 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -67,6 +67,22 @@ /* Defined if deal.II was configured with BLAS support */ #cmakedefine HAVE_LIBBLAS + +/************************************************* + * Configured in configure_functionparser.cmake: * + *************************************************/ + +/* Defined if you have the `functionparser' library */ +#cmakedefine HAVE_FUNCTIONPARSER + + +/***************************************** + * Configured in configure_lapack.cmake: * + *****************************************/ + +/* Defined if deal.II was configured with LAPACK support */ +#cmakedefine HAVE_LIBLAPACK + /* Define to 1 if you have the `daxpy_' function. */ #cmakedefine HAVE_DAXPY_ @@ -118,22 +134,6 @@ /* Define to 1 if you have the `dsygvx_' function. */ #cmakedefine HAVE_DSYGVX_ - -/************************************************* - * Configured in configure_functionparser.cmake: * - *************************************************/ - -/* Defined if you have the `functionparser' library */ -#cmakedefine HAVE_FUNCTIONPARSER - - -/***************************************** - * Configured in configure_lapack.cmake: * - *****************************************/ - -/* Defined if deal.II was configured with LAPACK support */ -#cmakedefine HAVE_LIBLAPACK - /* Define to 1 if you have the `sgeevx_' function. */ #cmakedefine HAVE_SGEEVX_