mirror of https://github.com/vitalif/openscad
commit
53c4954a71
|
@ -67,7 +67,11 @@ isEmpty(EIGEN_INCLUDEPATH) {
|
|||
}
|
||||
|
||||
# EIGEN being under 'include/eigen[2-3]' needs special prepending
|
||||
QMAKE_INCDIR_QT = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR_QT
|
||||
contains(QT_VERSION, ^5\\..*) {
|
||||
QMAKE_INCDIR = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR
|
||||
} else {
|
||||
QMAKE_INCDIR_QT = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR_QT
|
||||
}
|
||||
|
||||
# qmakespecs on netbsd prepend system includes, we need eigen first.
|
||||
netbsd* {
|
||||
|
|
|
@ -34,11 +34,6 @@ setenv_common()
|
|||
echo OPENSCAD_LIBRARIES modified
|
||||
echo GLEWDIR modified
|
||||
|
||||
if [ "`command -v qmake-qt4`" ]; then
|
||||
echo "Please re-run qmake-qt4 and run 'make clean' if necessary"
|
||||
else
|
||||
echo "Please re-run qmake and run 'make clean' if necessary"
|
||||
fi
|
||||
}
|
||||
|
||||
setenv_freebsd()
|
||||
|
@ -73,6 +68,49 @@ setenv_linux_clang()
|
|||
echo QMAKESPEC has been modified: $QMAKESPEC
|
||||
}
|
||||
|
||||
clean_note()
|
||||
{
|
||||
if [ $QT5_SETUP ]; then
|
||||
QMAKEBIN=qmake
|
||||
elif [ "`command -v qmake-qt4`" ]; then
|
||||
QMAKEBIN=qmake-qt4
|
||||
else
|
||||
QMAKEBIN=qmake
|
||||
fi
|
||||
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
|
||||
setenv_common
|
||||
if [ "`echo $* | grep clang`" ]; then
|
||||
|
@ -87,3 +125,10 @@ else
|
|||
setenv_common
|
||||
echo unknown system. guessed env variables. see 'setenv-unibuild.sh'
|
||||
fi
|
||||
|
||||
if [ "`echo $* | grep qt5`" ]; then
|
||||
setenv_qt5
|
||||
fi
|
||||
|
||||
clean_note
|
||||
|
||||
|
|
|
@ -31,6 +31,10 @@
|
|||
#
|
||||
# . ./scripts/setenv-unibuild.sh clang
|
||||
#
|
||||
# Enable Qt5 (experimental)
|
||||
#
|
||||
# . ./scripts/setenv-unibuild.sh qt5
|
||||
#
|
||||
|
||||
printUsage()
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue