From 233ff8e44c52e304baed76c73bbd34128689c1da Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 31 Dec 2021 15:15:34 +0100 Subject: [PATCH] spns #26832: use embedded opencv 3.x - system one breaks GEOM compilation --- applications/SALOME-9.8.0-native.pyconf | 2 +- applications/SALOME-master-native.pyconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf index af8deee..5d4dcfb 100644 --- a/applications/SALOME-9.8.0-native.pyconf +++ b/applications/SALOME-9.8.0-native.pyconf @@ -195,7 +195,7 @@ __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']" + __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34', 'DB11']" 'APPLICATION.products.opencv' : '3.2.0' } { diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index e3b357d..c116a0c 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -195,7 +195,7 @@ __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']" + __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34', 'DB11']" 'APPLICATION.products.opencv' : '3.2.0' } { -- 2.39.2