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 From 594471bc2273d8f7a27313c29d32dc3932e02451 Mon Sep 17 00:00:00 2001 From: don bright Date: Mon, 7 Jan 2013 21:55:35 -0600 Subject: notify user of QTDIR setting diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh index e6fd6fe..951f707 100644 --- a/scripts/setenv-unibuild.sh +++ b/scripts/setenv-unibuild.sh @@ -75,21 +75,30 @@ setenv_linux_clang() 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 [ ! $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\|debian`" ]; then - export QMAKESPEC=linux-clang + 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 - echo QTDIR has been modified: $QTDIR } if [ "`uname | grep -i 'linux\|debian'`" ]; then @@ -97,9 +106,6 @@ if [ "`uname | grep -i 'linux\|debian'`" ]; then 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 @@ -109,3 +115,7 @@ else setenv_common echo unknown system. guessed env variables. see 'setenv-unibuild.sh' fi + +if [ "`echo $* | grep qt5`" ]; then + setenv_qt5 +fi -- cgit v0.10.1 From 8282cd2ea5f764b8062631e236eaba6c0fdc3ea7 Mon Sep 17 00:00:00 2001 From: don bright Date: Mon, 7 Jan 2013 22:01:32 -0600 Subject: better detection of qmake-qt5 vs qmake for qt5 diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh index 951f707..881526e 100644 --- a/scripts/setenv-unibuild.sh +++ b/scripts/setenv-unibuild.sh @@ -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,8 +68,21 @@ 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 @@ -83,7 +91,7 @@ setenv_qt5() 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\|debian`" ]; then + if [ "`uname | grep -i linux`" ]; then QMAKESPEC=linux-clang echo QMAKESPEC has been modified: $QMAKESPEC fi @@ -99,6 +107,8 @@ setenv_qt5() 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 @@ -119,3 +129,6 @@ fi if [ "`echo $* | grep qt5`" ]; then setenv_qt5 fi + +clean_note + -- cgit v0.10.1