fix useless overwrite.

[tools/sat_salome.git] / applications / SALOME-9.8.0-native.pyconf

diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index 0e97603317a0738945bef330a1fb05f1d840dbbd..3d4a4c825b2cbda0254195a48a381b651531e2a3 100644 (file)
--- a/applications/SALOME-9.8.0-native.pyconf
+++ b/applications/SALOME-9.8.0-native.pyconf
@@ -191,19 +191,13 @@ APPLICATION :
 }
 __overwrite__ :
 [
-    {
-        # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
-        # deeper investigations need to be done in its sources. Use embedded openCV product where
-        # native one is 4.X.
-        __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34']"
-        'APPLICATION.products.opencv' : '3.2.0'
-    }
     {
         #
         __condition__ : "VARS.dist in ['UB20.04']"
+        'APPLICATION.products.opencv'  : '3.2.0'
         'APPLICATION.products.cminpack': 'native'
         'APPLICATION.products.PyFMI'    : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'                }
-        'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_0_4'}
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_04'             }
     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
@@ -218,7 +212,8 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['DB11']"
-        'APPLICATION.products.cminpack': 'native'
+        'APPLICATION.products.opencv'   : '3.2.0'
+        'APPLICATION.products.cminpack' : 'native'
         'APPLICATION.products.PyFMI'    : {tag:'2.5',    base: 'no',  section: 'version_2_5_no_pip'}
         'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB11'}
     }
@@ -234,6 +229,7 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
+        'APPLICATION.products.opencv'    : '3.2.0'
         'APPLICATION.products.PyFMI'     : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'}
         'APPLICATION.products.openturns' : {tag: '1.17',  base: 'no', section: 'version_1_17_FD32' }
         'APPLICATION.products.ParaView'  : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD32'}
@@ -241,6 +237,7 @@ __overwrite__ :
     {
         # FD 34 qt5 package is qt5-qtbase-devel.
         __condition__ : "VARS.dist in ['FD34']"
+        'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.omniORB'  : '4.2.4'
         'APPLICATION.products.omniORBpy': '4.2.4'
         'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'  }