diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-04-12 09:19:57 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-04-27 00:32:28 +0000 |
| commit | 9143a619827bf565effdcf43004749c2e7981939 (patch) | |
| tree | 7ece5372296b9c3bf6c7298ccb7fdbc4c924bf23 | |
| parent | c9562a1888fd7673b476496ffa1093486e7b47dc (diff) | |
Add support for qmake -query with /src and /get
Since qmake knows where the source and build dirs are as well as when
it's already installed or not, let's simply ask it.
Change-Id: Id75834dab9ed466e94c7ffff1444a9120ef90862
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | scripts/common.sh | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/scripts/common.sh b/scripts/common.sh index 3cbfdb5..b0281a3 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -72,19 +72,26 @@ function qt_select() export QTLIBDIR QT_SELECT # try to get the QTDIR from qmake now - QTDIR=$(qmake -query QT_INSTALL_PREFIX) + if QTSRCDIR=$(qmake -query QT_INSTALL_PREFIX/src); then + # Recent version of qmake that supports /get and /src + QTDIR=$(qmake -query QT_INSTALL_PREFIX/get) + export QTSRCDIR + else + # Older version + QTDIR=$(qmake -query QT_INSTALL_PREFIX) + + # is this an uninstalled Qt build dir? + if [ -f $QTDIR/Makefile ]; then + QTSRCDIR=$(dirname $(awk '/Project:/{print $NF}' $QTDIR/Makefile)) + export QTSRCDIR + else + unset QTSRCDIR + fi + fi export QTDIR qt_env_addto CMAKE_PREFIX_PATH $QTDIR export CMAKE_PREFIX_PATH - - # is this an uninstalled Qt build dir? - if [ -f $QTDIR/Makefile ]; then - QTSRCDIR=$(dirname $(awk '/Project:/{print $NF}' $QTDIR/Makefile)) - export QTSRCDIR - else - unset QTSRCDIR - fi else unset QTLIBDIR QTSRCDIR QTDIR QT_SELECT |