From f31bc4b0f1ea00ba416c2e620e7dcd424173e02e Mon Sep 17 00:00:00 2001 From: qc784398 Date: Fri, 5 Mar 2021 18:12:20 +0100 Subject: [PATCH] Align native configuration to master one - remove embedded boost on UB20 (native use is fixed) --- applications/SALOME-master-native.pyconf | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 37de627..3d5a0f7 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -29,7 +29,7 @@ APPLICATION : alabaster : 'native' Babel : 'native' boost : 'native' - CAS : 'CR740-SALOME-PATCH' + CAS : 'V7_5_0' certifi : 'native' # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us. # Rollback to embedded version to avoid versions mismatch between both of them (see imp_1538_cgns_export_import.py) @@ -80,7 +80,6 @@ APPLICATION : Pillow : 'native' # 'native' not exists : freeCAD part but not delivered with it from package handler planegcs : '0.18-3cb6890' - pockets : 'native' Pygments : 'native' pyparsing : 'native' PyQt : 'native' @@ -97,7 +96,6 @@ APPLICATION : six : 'native' snowballstemmer : 'native' Sphinx : 'native' - sphinxcontrib_napoleon : 'native' sphinxcontrib_websupport : 'native' sphinxintl: 'native' sphinx_rtd_theme : 'native' @@ -186,7 +184,7 @@ __overwrite__ : # At least on DB10 (UB20 uses the same path...), ParaView fails to find xmlpatterns executable # ParaViewClient.cmake try to find it from Qt5_DIR, going back from it in filesystem (hardcoded). # The standard patch is also needed to be able to build PARAVIS (same kind of issue). - __condition__ : "VARS.dist in ['DB10', 'UB20']" + __condition__ : "VARS.dist in ['DB10', 'UB20.04']" 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch', 'paraview.0003-ParaViewClient_native.patch'] } @@ -197,11 +195,5 @@ __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' - } ] -- 2.39.2