From 4952bddc6576e475c65d0291bd982f11a11a5ba0 Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Tue, 17 Oct 2023 12:16:06 +0200 Subject: [PATCH] Modify qt compilation --- applications/SALOME-master-native.pyconf | 2 +- products/qt.pyconf | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 29e4e55..1ea2c7b 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -268,12 +268,12 @@ __overwrite__ : { __condition__ : "VARS.dist in ['CO9']" 'APPLICATION.products.cminpack' : '1.3.6' - 'APPLICATION.products.qt' : '5.12.10' 'APPLICATION.products.qwt' : '6.1.2' 'APPLICATION.products.PyQt' : '5.15.3' 'APPLICATION.products.swig' : '4.0.2' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.openmpi' : '4.1.5' + 'APPLICATION.products.qt' : {tag: '5.12.10', base: 'no', section: 'version_5_12_10_CO9' } 'APPLICATION.products.sip' : {tag: '5.5.0', base: 'no', section: 'version_5_5_0_CO9' } 'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip' } 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } diff --git a/products/qt.pyconf b/products/qt.pyconf index dccf7f2..9fbc0b0 100644 --- a/products/qt.pyconf +++ b/products/qt.pyconf @@ -44,6 +44,13 @@ version_5_12_10 : patches : ['qt-mapbox-FD32-gcc-10.0.patch'] } +version_5_12_10_CO9 : +{ + compil_script : "qt-5.12.10" + $VARS.scriptExtension + depend : ["freetype", 'llvm'] + patches : ['qt-mapbox-FD32-gcc-10.0.patch', 'qt_numeric_limits_CO9.patch'] +} + version_5_12_10_win : { depend : ["freetype"] -- 2.39.2