Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
align Numpy compilation approach
[tools/sat_salome.git]
/
products
/
compil_scripts
/
qt-5.12.10.sh
diff --git
a/products/compil_scripts/qt-5.12.10.sh
b/products/compil_scripts/qt-5.12.10.sh
index 8f5773b31a34117720fed6da5393d7ddb7d2c736..70d8bae784b18a69222ba055269396eb96dc571e 100755
(executable)
--- 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 "##########################################################################"
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
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
# 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 \
$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 \