From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 11 May 2023 14:41:45 +0000 (+0200)
Subject: spns #34822: ParaView TBB VTK SMP based approach somehow breaks compilation of GUI
X-Git-Tag: V9_11_0~32
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bba57e7fcc3eb47c664fc1b7d164090a4a9f083a;p=tools%2Fsat_salome.git

spns #34822: ParaView TBB VTK SMP based approach somehow breaks compilation of GUI
---

diff --git a/products/patches/tbb-2019_U8_windows10_GUI.patch b/products/patches/tbb-2019_U8_windows10_GUI.patch
new file mode 100644
index 0000000..e481a3a
--- /dev/null
+++ b/products/patches/tbb-2019_U8_windows10_GUI.patch
@@ -0,0 +1,14 @@
+diff -Naur tbb-2019_U8_ref/include/tbb/internal/_tbb_windef.h tbb-2019_U8_dev/include/tbb/internal/_tbb_windef.h
+--- tbb-2019_U8_ref/include/tbb/internal/_tbb_windef.h	2019-06-06 12:29:15.000000000 +0200
++++ tbb-2019_U8_dev/include/tbb/internal/_tbb_windef.h	2023-05-11 16:36:53.677510682 +0200
+@@ -20,6 +20,10 @@
+ 
+ // Check that the target Windows version has all API calls required for TBB.
+ // Do not increase the version in condition beyond 0x0500 without prior discussion!
++#if defined(_WIN32_WINNT) 
++#undef _WIN32_WINNT  
++#define _WIN32_WINNT 0x0501
++#endif
+ #if defined(_WIN32_WINNT) && _WIN32_WINNT<0x0501
+ #error TBB is unable to run on old Windows versions; _WIN32_WINNT must be 0x0501 or greater.
+ #endif
diff --git a/products/tbb.pyconf b/products/tbb.pyconf
index c78cd93..acd1049 100644
--- a/products/tbb.pyconf
+++ b/products/tbb.pyconf
@@ -38,7 +38,7 @@ version_2019_U8 :
 version_2019_U8_win :
 {
     archive_info : {archive_name : "tbb-2019_U8.tar.gz"}
-    patches : ['tbb-2019_U8_windows10.patch']
+    patches : ['tbb-2019_U8_windows10.patch', 'tbb-2019_U8_windows10_GUI.patch']
     depend : ['Python']
     build_depend : ['swig']
     properties :
@@ -51,7 +51,7 @@ version_2019_U8_win :
 version_2019_U8_win_dbg :
 {
     archive_info : {archive_name : "tbb-2019_U8.tar.gz"}
-    patches : ['tbb-2019_U8_windows10.patch', 'tbb-2019_U8_windows10_debug.patch']
+    patches : ['tbb-2019_U8_windows10.patch', 'tbb-2019_U8_windows10_GUI.patch', 'tbb-2019_U8_windows10_debug.patch']
     depend : ['Python']
     opt_depend : ['ispc']
     build_depend : ['swig']