X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2Fqt-5.12.10.sh;h=70d8bae784b18a69222ba055269396eb96dc571e;hb=0c9d4898a9a7ac1ea4f5732e7800fd5e18788a0f;hp=8f5773b31a34117720fed6da5393d7ddb7d2c736;hpb=48d1d1e7d9e90527b0cdd362989a0c3fb895a22b;p=tools%2Fsat_salome.git diff --git a/products/compil_scripts/qt-5.12.10.sh b/products/compil_scripts/qt-5.12.10.sh index 8f5773b..70d8bae 100755 --- a/products/compil_scripts/qt-5.12.10.sh +++ b/products/compil_scripts/qt-5.12.10.sh @@ -4,11 +4,14 @@ echo "########################################################################## echo "Qt" $VERSION echo "##########################################################################" - -if [[ $DIST_NAME == "FD" && $DIST_VERSION == "32" ]] -then - export QMAKE_CXXFLAGS="-std=c++11" -fi +LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" +case $LINUX_DISTRIBUTION in + FD32|DB11) + export QMAKE_CXXFLAGS="-std=c++11" + ;; + *) + ;; +esac if [ -n "$SAT_DEBUG" ] then @@ -22,7 +25,7 @@ rm -rf $BUILD_DIR && mkdir -p $BUILD_DIR && cd $BUILD_DIR # For -qt-harfbuzz option, see spns #9694 echo -echo "*** $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper" +echo "*** configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper" $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath \ -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine \