]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
debug
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 17:30:37 +0000 (17:30 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 17:30:37 +0000 (17:30 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25829 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 6ad8f5157a609c864fe21ba416aeb04182f69a80..0a314878195e15750423344f4b9a90c7a0d743bc 100644 (file)
@@ -11,7 +11,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR true)
 # General configuration options:
 #
 
-OPTION(DEAL_II_USE_CONTRIB "Build and use contrib libraries bundled with the source tarball." ON)
+OPTION(DEAL_II_USE_CONTRIB "Build and use contrib libraries bundled with the source tarball." OFF)
 OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK, BLAS and LAPACK." ON)
 OPTION(DEAL_II_WITH_THREADS "Build deal.II with support for threads. This pulls in libtbb as a dependency." ON)
 OPTION(DEAL_II_WITH_METIS "Build deal.II with support for Metis." OFF)
index dac9b771d12f1f8dbb19da63b0d30190ba8ce4f1..fbea8a24b0465477e1ce4c39190416fbd0ad7c76 100644 (file)
@@ -16,7 +16,7 @@ FIND_LIBRARY(TBB_LIBRARY
   PATH_SUFFIXES lib64 lib
 )
 
-FIND_LIBRARY(Tbb_DEBUG_LIBRARY
+FIND_LIBRARY(TBB_DEBUG_LIBRARY
   NAMES libtbb_debug.so
   PATHS
   $ENV{TBB_DEBUG_LIBRARY_DIR}
@@ -24,7 +24,8 @@ FIND_LIBRARY(Tbb_DEBUG_LIBRARY
   PATH_SUFFIXES lib64 lib
 )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR) #TBB_DEBUG_LIBRARY
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB_DEBUG DEFAULT_MSG TBB_DEBUG_LIBRARY TBB_INCLUDE_DIR)
 
 MARK_AS_ADVANCED(
   TBB_LIBRARY

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.