]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 13 Sep 2012 17:24:58 +0000 (17:24 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 13 Sep 2012 17:24:58 +0000 (17:24 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26359 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt

index 7217e87ae25cdc8e9cf8ca2e6f7b0bb74be620d2..2acb1aab4bf4bbd6a7f82958a4943d641bc894cc 100644 (file)
@@ -89,7 +89,7 @@ OPTION(DEAL_II_WITH_THREADS
 
 OPTION(DEAL_II_WITH_UMFPACK
   "Build deal.II with support for UMFPACK, BLAS and LAPACK."
-  OFF)
+  ON)
 
 OPTION(DEAL_II_WITH_ZLIB
   "Build deal.II with support for zlib."
@@ -121,7 +121,7 @@ OPTION(DEAL_II_FORCE_CONTRIB_TBB
 
 OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK
   "Always use the bundled umfpack library instead of an external one."
-  OFF)
+  ON)
 
 #
 # Compatibility support:
index af5c84f71342f7a6c9cbd60326a82a2e799fa183..206617c5f0c177175a887f2a551b292d6ca1dd29 100644 (file)
@@ -11,6 +11,10 @@ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/version_string.tmp"
   )
 
 SET(src_tbb
+  rml/client/omp_dynamic_link.cpp
+  rml/client/rml_omp.cpp
+  rml/client/rml_tbb.cpp
+  rml/server/rml_server.cpp
   tbb/arena.cpp
   tbb/cache_aligned_allocator.cpp
   tbb/concurrent_hash_map.cpp

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.