From: Matthias Maier Date: Mon, 10 Sep 2012 13:02:29 +0000 (+0000) Subject: CMAKE Build environment for Umfpack X-Git-Tag: v8.0.0~1079^2~939 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9da3b3a0d97e67b9b5f4458a7225e95332f7b349;p=dealii.git CMAKE Build environment for Umfpack git-svn-id: https://svn.dealii.org/branches/branch_cmake@26262 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index fedb57c2e2..26f7d857cd 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -14,7 +14,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR true) OPTION(DEAL_II_USE_CONTRIB "Build and use contrib libraries bundled with the source tarball." - OFF + ON ) OPTION(DEAL_II_WITH_THREADS "Build deal.II with support for threads. This pulls in libtbb as a dependency." diff --git a/deal.II/contrib/cmake/modules/prepare_umfpack.cmake b/deal.II/contrib/cmake/modules/prepare_umfpack.cmake index 0b0a3b0c5b..abbb96ea6b 100644 --- a/deal.II/contrib/cmake/modules/prepare_umfpack.cmake +++ b/deal.II/contrib/cmake/modules/prepare_umfpack.cmake @@ -15,8 +15,10 @@ IF(DEAL_II_USE_CONTRIB) ) LIST(APPEND deal_ii_additional_object_files - $ - $ + ${obj_umfpack_object_files} + $ + $ + $ ) ELSE() FIND_PACKAGE(Umfpack REQUIRED)