mirror of https://github.com/vitalif/openscad
remove /opt/qt5 hack in setenv script. (distros have their own way to specify)
parent
05e1dd7df4
commit
d32956a942
|
@ -110,9 +110,7 @@ setenv_netbsd_clang()
|
||||||
|
|
||||||
clean_note()
|
clean_note()
|
||||||
{
|
{
|
||||||
if [ $QT5_SETUP ]; then
|
if [ "`command -v qmake-qt4`" ]; then
|
||||||
QMAKEBIN=qmake
|
|
||||||
elif [ "`command -v qmake-qt4`" ]; then
|
|
||||||
QMAKEBIN=qmake-qt4
|
QMAKEBIN=qmake-qt4
|
||||||
else
|
else
|
||||||
QMAKEBIN=qmake
|
QMAKEBIN=qmake
|
||||||
|
@ -120,37 +118,6 @@ clean_note()
|
||||||
echo "Please re-run" $QMAKEBIN "and run 'make clean' if necessary"
|
echo "Please re-run" $QMAKEBIN "and run 'make clean' if necessary"
|
||||||
}
|
}
|
||||||
|
|
||||||
setenv_qt5()
|
|
||||||
{
|
|
||||||
QT5_SETUP=true
|
|
||||||
if [ ! $QTDIR ]; then
|
|
||||||
QTDIR=/opt/qt5
|
|
||||||
echo Please set QTDIR before running this qt5 script. Assuming $QTDIR
|
|
||||||
fi
|
|
||||||
PATH=$QTDIR/bin:$PATH
|
|
||||||
LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
|
|
||||||
LD_RUN_PATH=$QTDIR/lib:$LD_RUN_PATH
|
|
||||||
if [ "`echo $CC | grep clang`" ]; then
|
|
||||||
if [ "`uname | grep -i linux`" ]; then
|
|
||||||
QMAKESPEC=linux-clang
|
|
||||||
echo QMAKESPEC has been modified: $QMAKESPEC
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
export QTDIR
|
|
||||||
export PATH
|
|
||||||
export LD_LIBRARY_PATH
|
|
||||||
export LD_RUN_PATH
|
|
||||||
export QMAKESPEC
|
|
||||||
|
|
||||||
echo QTDIR is set to: $QTDIR
|
|
||||||
echo PATH has been modified with $QTDIR/bin
|
|
||||||
echo LD_LIBRARY_PATH has been modified with $QTDIR/lib
|
|
||||||
echo LD_RUN_PATH has been modified with $QTDIR/lib
|
|
||||||
|
|
||||||
export QT5_SETUP
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "`uname | grep -i 'linux\|debian'`" ]; then
|
if [ "`uname | grep -i 'linux\|debian'`" ]; then
|
||||||
setenv_common
|
setenv_common
|
||||||
if [ "`echo $* | grep clang`" ]; then
|
if [ "`echo $* | grep clang`" ]; then
|
||||||
|
@ -172,10 +139,6 @@ else
|
||||||
echo unknown system. guessed env variables. see 'setenv-unibuild.sh'
|
echo unknown system. guessed env variables. see 'setenv-unibuild.sh'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "`echo $* | grep qt5`" ]; then
|
|
||||||
setenv_qt5
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e $DEPLOYDIR/include/Qt ]; then
|
if [ -e $DEPLOYDIR/include/Qt ]; then
|
||||||
echo "Qt found under $DEPLOYDIR ... "
|
echo "Qt found under $DEPLOYDIR ... "
|
||||||
QTDIR=$DEPLOYDIR
|
QTDIR=$DEPLOYDIR
|
||||||
|
|
Loading…
Reference in New Issue