TTK add second patch

diff --git a/products/TTK.pyconf b/products/TTK.pyconf
index 5fff2f027398a4f37e2e44a139cbed1ba5c23964..ed1d4f0201759d0fee5456e864769b6018153265 100644 (file)
--- a/products/TTK.pyconf
+++ b/products/TTK.pyconf
@@ -26,3 +26,8 @@ version_f8dafde2d7 :
 {
   patches: ['ttk-f8dafde2d7-p01.patch']
 }
+
+version_f8dafde2d7_win :
+{
+  patches: ['ttk-f8dafde2d7-p01.patch', 'ttk-f8dafde2d7-p02.patch']
+}
\ No newline at end of file

diff --git a/products/compil_scripts/TTK.bat b/products/compil_scripts/TTK.bat
index 7d0cf4a55d60faedb7275ddf609769cac3ab0f9d..0f29c996d8056317002aef55e5a40b8b328083f9 100644 (file)
--- a/products/compil_scripts/TTK.bat
+++ b/products/compil_scripts/TTK.bat
@@ -30,7 +30,17 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%/lib/cm
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEMBREE_INCLUDE_DIR=%EMBREE_ROOT_DIR:\=/%/include
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
 
-
+REM Boost settings
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="1.67.0 1.67"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_SYSTEM_PATHS:BOOL=ON
+rem SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_USE_STATIC_LIBS=OFF
+REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ttkCinemaWriter=NO
+REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ttkCinemaQuery=NO
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE=ON
 cd %BUILD_DIR%
 
 echo.
@@ -55,12 +65,6 @@ if NOT %ERRORLEVEL% == 0 (
     exit 2
 )
 
-copy src\%PRODUCT_BUILD_TYPE%\cgnsdll.dll src\cgnsdll.dll
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on copying cgnsdll.dll
-    exit 21
-)
-
 echo.
 echo --------------------------------------------------------------------------
 echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj

diff --git a/products/patches/ttk-f8dafde2d7-p02.patch b/products/patches/ttk-f8dafde2d7-p02.patch
new file mode 100644 (file)
index 0000000..c00521f
--- /dev/null
+++ b/products/patches/ttk-f8dafde2d7-p02.patch
@@ -0,0 +1,10 @@
+--- ttk_ref/core/base/discreteGradient/DiscreteGradient_Template.h     2022-09-29 17:26:37.000000000 +0200
++++ ttk_dev/core/base/discreteGradient/DiscreteGradient_Template.h     2022-10-18 13:47:11.215790817 +0200
+@@ -23,6 +23,7 @@
+ using ttk::dcg::DiscreteGradient;
+ using ttk::dcg::SaddleSaddleVPathComparator;
+ using ttk::dcg::VPath;
++using ttk::VisitedMask;
+ 
+ template <typename dataType, typename triangulationType>
+ dataType DiscreteGradient::getPersistence(