luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto-detect Qt5 version in build script if not given.

This commit is contained in:
Matthias Koefferlein 2017-06-18 22:13:11 +02:00
parent 5ee781a93f
commit 0978fb527f
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build.sh
View File

@ -24,7 +24,7 @@ RUN_MAKE=1
HAVE_QTBINDINGS=1 HAVE_QTBINDINGS=1
HAVE_64BIT_COORD=0 HAVE_64BIT_COORD=0
HAVE_QT5=0 HAVE_QT5=""
RUBYINCLUDE="" RUBYINCLUDE=""
RUBYINCLUDE2="" RUBYINCLUDE2=""
@ -158,8 +158,7 @@ while [ "$*" != "" ]; do
echo " (only available for gcc>=4.4 for 64bit build)" echo " (only available for gcc>=4.4 for 64bit build)"
echo " -without-64bit-coord Don't use long (64bit) coordinates [default]" echo " -without-64bit-coord Don't use long (64bit) coordinates [default]"
echo "" echo ""
echo " -qt5 Use Qt5" echo " -qt4|-qt5 Use Qt4 or Qt5 API [default: auto detect]"
echo " -qt4 Use Qt4 [default]"
echo "" echo ""
echo " -dry-run Don't build, just run qmake" echo " -dry-run Don't build, just run qmake"
echo "" echo ""
@ -184,6 +183,23 @@ done
echo "Scanning installation .." echo "Scanning installation .."
echo "" echo ""
# if not given, try to detect the qt major version to use
if [ "$HAVE_QT5" = "" ]; then
qt_major=`$QMAKE -v | grep 'Using Qt version' | sed 's/.*version *\([0-9][0-9]*\).*/\1/'`
if [ "$qt_major" = "4" ]; then
HAVE_QT5=0
echo "Using Qt 4 API"
echo ""
elif [ "$qt_major" = "5" ]; then
HAVE_QT5=1
echo "Using Qt 5 API"
echo ""
else
echo "*** ERROR: could not determine Qt version from '$QMAKE -v'"
exit 1
fi
fi
# if not given, locate ruby interpreter (prefer 1.9, then default, finally 1.8 as fallback) # if not given, locate ruby interpreter (prefer 1.9, then default, finally 1.8 as fallback)
if [ "$RUBY" != "-" ]; then if [ "$RUBY" != "-" ]; then
for ruby in "ruby1.9" "ruby" "ruby1.8"; do for ruby in "ruby1.9" "ruby" "ruby1.8"; do