From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 26 Jul 2021 09:21:43 +0000 (+0200)
Subject: backport opencv 3.2 patch fix - aimed to build ALAMOS-9.3.0 -windows
X-Git-Tag: V9_8_0~122
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e9adddf7742e8952bad94b1641761d2f70b1efbf;p=tools%2Fsat_salome.git

backport opencv 3.2 patch fix - aimed to build ALAMOS-9.3.0 -windows
---

diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf
index 5ee554b..2c8d85a 100644
--- a/products/GEOM.pyconf
+++ b/products/GEOM.pyconf
@@ -55,7 +55,7 @@ default_win :
     cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR:\=/% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS:\=/% "
 }
 
-version_V9_3_0_to_V9_6_0 :
+version_V9_4_0_to_V9_6_0 :
 {
     depend : ["KERNEL",
               "GUI",
@@ -77,6 +77,35 @@ version_V9_3_0_to_V9_6_0 :
              ]
 }
 
+version_V9_3_0 :
+{
+    depend : ["KERNEL",
+              "GUI",
+              "boost",
+              "CAS",
+              "Python",
+              "hdf5",
+              "omniORB",
+              "qt",
+              "ParaView",
+              "docutils",
+              "Sphinx",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "opencv",
+              "six",
+              "pytz"
+             ]
+    patches : []
+}
+
+version_V9_3_0_win :
+{
+   # backporting the opencv 3.2 patch -  since windows uses this version of OpenCV
+   patches : ['GEOM-9.3.0-opencv_windows.patch']
+}
+
 version_V8_5_0_to_V9_2_1 :  # these versions requires the path geom_8.5.0_xao_data_dir.patch (for salome test)
 {
     patches : [