From: maier Date: Thu, 9 Aug 2012 22:55:45 +0000 (+0000) Subject: Some last changes for today X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33cc6138a28b8c3bcc28f08a588664dc598c6ff7;p=dealii-svn.git Some last changes for today git-svn-id: https://svn.dealii.org/branches/branch_cmake@25849 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 2b801b9876..fa73cb6054 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -38,6 +38,9 @@ SET(CMAKE_MODULE_PATH # ADD_CUSTOM_TARGET(deal_ii_target_dependencies) + +# TODO: Version Mumbo Jumbo + IF(DEAL_II_WITH_THREADS) INCLUDE(deal_ii_with_threads) ENDIF() @@ -46,7 +49,7 @@ IF(DEAL_II_WITH_UMFPACK) INCLUDE(deal_ii_with_umfpack) ENDIF() - +# TODO: The rest... # # Build the toolchain: diff --git a/deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake b/deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake index 2ed8fbbfc4..dffc0a9b98 100644 --- a/deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake +++ b/deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake @@ -20,3 +20,7 @@ SET(deal_ii_external_debug_libraries ${deal_ii_external_debug_libraries} ${Umfpack_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ) + +SET(HAVE_LIBBLAS TRUE) +SET(HAVE_LIBLAPACK TRUE) +SET(HAVE_LIBUMFPACK TRUE)