From: Matthias Maier <tamiko@43-1.org>
Date: Tue, 26 May 2020 17:08:00 +0000 (-0500)
Subject: update config.h.in
X-Git-Tag: v9.3.0-rc1~1546^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad8cb23a3dffabbfd183c1a521ebdefd67e0bd8e;p=dealii.git

update config.h.in
---

diff --git a/cmake/configure/configure_1_tbb.cmake b/cmake/configure/configure_1_tbb.cmake
index 318e2f1145..9ef8b84e5c 100644
--- a/cmake/configure/configure_1_tbb.cmake
+++ b/cmake/configure/configure_1_tbb.cmake
@@ -79,5 +79,3 @@ ENDMACRO()
 
 
 CONFIGURE_FEATURE(TBB)
-SET(DEAL_II_WITH_THREADS ${DEAL_II_WITH_TBB})
-
diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 92b30760aa..e31b71df5f 100644
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -39,6 +39,7 @@
 #cmakedefine DEAL_II_WITH_ARPACK
 #cmakedefine DEAL_II_WITH_ASSIMP
 #cmakedefine DEAL_II_WITH_COMPLEX_VALUES
+#cmakedefine DEAL_II_WITH_CPP_TASKFLOW
 #cmakedefine DEAL_II_WITH_CUDA
 #cmakedefine DEAL_II_WITH_GINKGO
 #cmakedefine DEAL_II_WITH_GSL
@@ -59,11 +60,19 @@
 #cmakedefine DEAL_II_WITH_SLEPC
 #cmakedefine DEAL_II_WITH_SUNDIALS
 #cmakedefine DEAL_II_WITH_SYMENGINE
-#cmakedefine DEAL_II_WITH_THREADS
+#cmakedefine DEAL_II_WITH_TBB
 #cmakedefine DEAL_II_WITH_TRILINOS
 #cmakedefine DEAL_II_WITH_UMFPACK
 #cmakedefine DEAL_II_WITH_ZLIB
 
+/*
+ * Backward compatibility setting:
+ * FIXME: Update once transition to cpp-taskflow is complete
+ */
+#ifdef DEAL_II_WITH_TBB
+#define DEAL_II_WITH_THREADS
+#endif
+
 /***********************************************************************
  * Compiler bugs:
  *