diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-08 03:48:26 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-08 03:48:26 (GMT) |
| commit | 25266bed0d6c3a0caae80a0444c073fee78cc686 (patch) | |
| tree | 207577fa35afd638893fc87ffbb003c120ec9154 | |
| parent | 101510c5cb3f696ee01fc900c9269d87a09c0658 (diff) | |
allow qt5 build
| -rw-r--r-- | eigen.pri | 6 | ||||
| -rw-r--r-- | scripts/setenv-unibuild.sh | 22 | ||||
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 4 |
3 files changed, 31 insertions, 1 deletions
@@ -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() { |