From 45cdd97b2a01a9cfcb3fc0b85ee32dd0546f6e40 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 9 Aug 2012 17:30:37 +0000 Subject: [PATCH] debug git-svn-id: https://svn.dealii.org/branches/branch_cmake@25829 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 2 +- deal.II/contrib/cmake/modules/FindTBB.cmake | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 6ad8f5157a..0a31487819 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -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) diff --git a/deal.II/contrib/cmake/modules/FindTBB.cmake b/deal.II/contrib/cmake/modules/FindTBB.cmake index dac9b771d1..fbea8a24b0 100644 --- a/deal.II/contrib/cmake/modules/FindTBB.cmake +++ b/deal.II/contrib/cmake/modules/FindTBB.cmake @@ -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 -- 2.39.5