From: Matthias Maier Date: Wed, 25 Jun 2014 20:33:49 +0000 (+0000) Subject: CMake: Bugfix: Also add tbb specific include directories to the list of user include... X-Git-Tag: v8.2.0-rc1~355 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc6aa3950355ea76edf81c22e20a1033f22d2e48;p=dealii.git CMake: Bugfix: Also add tbb specific include directories to the list of user include dirs git-svn-id: https://svn.dealii.org/trunk@33085 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake index f07f29725d..04b11766b2 100644 --- a/deal.II/cmake/configure/configure_1_threads.cmake +++ b/deal.II/cmake/configure/configure_1_threads.cmake @@ -166,6 +166,7 @@ MACRO(FEATURE_THREADS_CONFIGURE_EXTERNAL) LIST(APPEND THREADS_LIBRARIES ${TBB_LIBRARIES}) LIST(APPEND THREADS_INCLUDE_DIRS ${TBB_INCLUDE_DIRS}) + LIST(APPEND THREADS_USER_INCLUDE_DIRS ${TBB_USER_INCLUDE_DIRS}) ENDMACRO() diff --git a/deal.II/cmake/modules/FindTBB.cmake b/deal.II/cmake/modules/FindTBB.cmake index fe2cc824de..716e8d5a87 100644 --- a/deal.II/cmake/modules/FindTBB.cmake +++ b/deal.II/cmake/modules/FindTBB.cmake @@ -82,5 +82,6 @@ ENDIF() DEAL_II_PACKAGE_HANDLE(TBB LIBRARIES REQUIRED ${_libraries} INCLUDE_DIRS REQUIRED TBB_INCLUDE_DIR + USER_INCLUDE_DIRS REQUIRED TBB_INCLUDE_DIR CLEAR TBB_DEBUG_LIBRARY TBB_LIBRARY TBB_INCLUDE_DIR ) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index c8ca073a36..c22b598537 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -148,6 +148,13 @@ inconvenience this causes.

Specific improvements

    +
  1. Bugfix: TBB specific include directories have to be added to the + list of user include directories because of direct inclusion of header + files in base/thread_local_storage.h. +
    + (Matthias Maier, Kainan Wang, 2014/06/25) +
  2. +
  3. Improved: GridGenerator::hyper_cube() accepts a colorize argument.