]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix. *cough* *cough*
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 17 Sep 2012 18:09:12 +0000 (18:09 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 17 Sep 2012 18:09:12 +0000 (18:09 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26441 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/configure/configure_blas.cmake
deal.II/contrib/cmake/configure/configure_lapack.cmake
deal.II/include/deal.II/base/config.h.in

index 71a4db091dd0e0cd4bfe0ad8c2ed93c556f8b067..3f12dc282def466e5c8f43025d3bea60255545aa 100644 (file)
@@ -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)
index 532f5a8c27cd4ade6bd23da117239abf6344fb62..bfe389a6f5d3e43169f5d62eb78900481e09519f 100644 (file)
@@ -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}")
index 75b5486e49bac632a7c8e9033aea55e2c130d71a..da99e9328d66e3c670c6ea04b2c5dda72ed0cddc 100644 (file)
 /* 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_
 
 /* 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_
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.