CMake: Bugfix: Also add tbb specific include directories to the list of user include...

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 f07f29725d8aa4363fea328d759795aec48c00fd..04b11766b236f7ab329671f650a77f1067adc18a 100644 (file)
--- 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 fe2cc824def165e25c4b10a73240060e3ccf6fe6..716e8d5a87eacf07e35bb4ef8afc2af4c45fd5b7 100644 (file)
--- 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 c8ca073a36810104d5f89b31c4a62f0ad8ebac7f..c22b5985375b7e6cc08017c8356ec5d53ed0fb5f 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -148,6 +148,13 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
+  <li> 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.
+  <br>
+  (Matthias Maier, Kainan Wang, 2014/06/25)
+  </li>
+
   <li> Improved: GridGenerator::hyper_cube() accepts a
   <code>colorize</code> argument.
   <br>