From 78cb5f962b3557a1e8576324f193439642bbfce1 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 16 Dec 2021 16:17:00 +0100 Subject: [PATCH] rearrange salome system dependencies --- products/salome_system.pyconf | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index 9378de2..71e29fd 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -30,20 +30,34 @@ default : apt_dev : ["libssl-dev", "gcc", "make", "sed", "g++", "libexpat1-dev", "libfontconfig1-dev", "flex", "bison", "libglu1-mesa-dev", "perl", "libxcb-dri2-0-dev", "libxkbcommon-dev", "libxkbcommon-x11-dev", "bzip2", "libxi-dev", "libxt-dev", "libxmu-dev", "libxpm-dev", "libxft-dev", "automake", "libtool", "libjpeg-dev", - "cmake", "libicu-dev", "libopenmpi-dev", "libreadline-dev", "libhwloc-dev", "libsqlite3-dev", - "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"] + "cmake", "libicu-dev", "libopenmpi-dev", "libreadline-dev", "libhwloc-dev", "libsqlite3-dev"] - # specific to some plateform(s) + # specific to some platform(s) "CO7" : { rpm : ["lz4"] - rpm_dev : ["perl", "qt5-devel"] + rpm_dev : ["perl"] } - "CO8-FD30-FD32" : + "CO8" : { rpm : ["lz4"] rpm_dev : ["perl-interpreter", "qt5-devel"] } + "FD30" : + { + rpm : ["lz4"] + rpm_dev : ["perl-interpreter", "qt5-devel"] + } + "FD32" : + { + rpm : ["lz4"] + rpm_dev : ["perl-interpreter", "qt5-devel"] + } + "FD34" : + { + rpm : ["lz4-libs"] + rpm_dev : ["lz4-devel", "qt5-qtbase-devel"] + } "DB08" : { apt : ["libopenexr6", "libwebp5", "libgfortran3", "libilmbase6", "libevent-2.0-5", "libpng12-0", "libgcc-4.9-dev", @@ -59,7 +73,8 @@ default : { apt : ["libopenexr23", "libwebp6", "libgfortran5", "libilmbase23", "libevent-2.1-6", "libpng16-16", "libgcc-8-dev", "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0"] - apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev"] + apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", + "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"] } "UB16.04" : @@ -78,12 +93,8 @@ default : { apt : ["libopenexr24", "libwebp6", "libgfortran5", "libilmbase24", "libevent-2.1-7", "libpng16-16", "libgcc-9-dev", "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0"] - apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev"] - } - "FD34" : - { - rpm : ["lz4-libs"] - rpm_dev : ["lz4-devel", "qt5-qtbase-devel"] + apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", + "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"] } } -- 2.39.2