From 25266bed0d6c3a0caae80a0444c073fee78cc686 Mon Sep 17 00:00:00 2001 From: don bright Date: Mon, 7 Jan 2013 21:48:26 -0600 Subject: allow qt5 build diff --git a/eigen.pri b/eigen.pri index efb2d3c..dac38a6 100644 --- a/eigen.pri +++ b/eigen.pri @@ -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* { diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh index d13782c..e6fd6fe 100644 --- a/scripts/setenv-unibuild.sh +++ b/scripts/setenv-unibuild.sh @@ -73,11 +73,33 @@ setenv_linux_clang() echo QMAKESPEC has been modified: $QMAKESPEC } +setenv_qt5() +{ + export QTDIR=/opt/qt5 + export PATH=$QTDIR/bin:$PATH + export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH + export LD_RUN_PATH=$QTDIR/lib:$LD_RUN_PATH + if [ "`echo $CC | grep clang`" ]; then + if [ "`uname | grep -i linux\|debian`" ]; then + export QMAKESPEC=linux-clang + echo QMAKESPEC has been modified: $QMAKESPEC + fi + fi + + 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 + echo QTDIR has been modified: $QTDIR +} + if [ "`uname | grep -i 'linux\|debian'`" ]; then setenv_common if [ "`echo $* | grep clang`" ]; then setenv_linux_clang fi + if [ "`echo $* | grep qt5`" ]; then + setenv_qt5 + fi elif [ "`uname | grep -i freebsd`" ]; then setenv_freebsd elif [ "`uname | grep -i netbsd`" ]; then diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 88f2cf8..0c37605 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -31,6 +31,10 @@ # # . ./scripts/setenv-unibuild.sh clang # +# Enable Qt5 (experimental) +# +# . ./scripts/setenv-unibuild.sh qt5 +# printUsage() { -- cgit v0.10.1