From: Quentin Cozette <quentin.cozette@cea.fr>
Date: Thu, 28 Jan 2021 17:34:10 +0000 (+0100)
Subject: Allow build on UB20 : embed boost (1.67.0) and opencv (3.2.0)
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d9287701f6642fa2172778f1879b4f44f062f349;p=tools%2Fsat_salome.git

Allow build on UB20 : embed boost (1.67.0) and opencv (3.2.0)
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 847604f..3cb2880 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -179,7 +179,7 @@ __overwrite__ :
       # FD32 is the first to use native opencv4 version (4.2.0) : FindOpenCV.cmake fails (GEOM)
       # Associated library path is found through cv.h header which has been removed
       # (cf. release note of 2.2 version : use imgproc/imgproc.hpp instead - actually included too)
-      __condition__ : "VARS.dist in ['FD32']"
+      __condition__ : "VARS.dist in ['FD32', 'UB20.04']"
       'APPLICATION.products.opencv' : '3.2.0'
    }
    {
@@ -197,5 +197,10 @@ __overwrite__ :
       'APPLICATION.products.sphinxintl' : '0.9.10'
       'PRODUCTS.sphinxintl.default.properties.pip' : "no"
    }
+   {
+      # boost >= 1.70.0 use a new config mode which occurs compliant issue with compilation flags (GUI)
+      # Before fixing it, use embedded version, aligned on W10 (higher one)
+      __condition__ : "VARS.dist in ['UB20.04']"
+      'APPLICATION.products.boost' : '1.67.0'
 ]