]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMAKE Build environment for Umfpack
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 10 Sep 2012 13:02:29 +0000 (13:02 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 10 Sep 2012 13:02:29 +0000 (13:02 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26262 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/modules/prepare_umfpack.cmake

index fedb57c2e27e30cb39a3c7487eadafdd1d7a388b..26f7d857cdb9bd6dd918f33737fe94ed18c9cafb 100644 (file)
@@ -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."
index 0b0a3b0c5bdb8f1f1a743c1bd863acacc2f11856..abbb96ea6b84e5f77514b3fad3b8b0c4cdfc4b7a 100644 (file)
@@ -15,8 +15,10 @@ IF(DEAL_II_USE_CONTRIB)
     )
 
   LIST(APPEND deal_ii_additional_object_files
-    $<TARGET_OBJECTS:obj_umfpack>
-    $<TARGET_OBJECTS:obj_amd>
+    ${obj_umfpack_object_files}
+    $<TARGET_OBJECTS:obj_amd_int>
+    $<TARGET_OBJECTS:obj_amd_long>
+    $<TARGET_OBJECTS:obj_amd_global>
     )
 ELSE()
   FIND_PACKAGE(Umfpack REQUIRED)

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.