From: maier Date: Thu, 13 Sep 2012 17:24:58 +0000 (+0000) Subject: Bugfix X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20fcc4df87997f5ee181596e11f2d1bc00190be0;p=dealii-svn.git Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26359 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 7217e87ae2..2acb1aab4b 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -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: diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt b/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt index af5c84f713..206617c5f0 100644 --- a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt +++ b/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt @@ -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