Mercurial > hg > svcore
comparison acinclude.m4 @ 792:a98af74f8e2f qt5
Look for qmake-qt5, not qt4
author | Chris Cannam |
---|---|
date | Fri, 26 Apr 2013 16:37:07 +0100 |
parents | 5f75414d85f6 |
children | dbb7f0ab011e |
comparison
equal
deleted
inserted
replaced
784:8e8d0f1f4f85 | 792:a98af74f8e2f |
---|---|
64 AC_DEFUN([SV_CHECK_QT], | 64 AC_DEFUN([SV_CHECK_QT], |
65 [ | 65 [ |
66 AC_REQUIRE([AC_PROG_CXX]) | 66 AC_REQUIRE([AC_PROG_CXX]) |
67 | 67 |
68 if test x$QMAKE = x ; then | 68 if test x$QMAKE = x ; then |
69 AC_CHECK_PROG(QMAKE, qmake-qt4, $QTDIR/bin/qmake-qt4,,$QTDIR/bin/) | 69 AC_CHECK_PROG(QMAKE, qmake-qt5, $QTDIR/bin/qmake-qt5,,$QTDIR/bin/) |
70 fi | 70 fi |
71 if test x$QMAKE = x ; then | 71 if test x$QMAKE = x ; then |
72 AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/) | 72 AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/) |
73 fi | 73 fi |
74 if test x$QMAKE = x ; then | 74 if test x$QMAKE = x ; then |
75 AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) | 75 AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) |
76 fi | 76 fi |
77 if test x$QMAKE = x ; then | 77 if test x$QMAKE = x ; then |
78 AC_CHECK_PROG(QMAKE, qmake-qt4, qmake-qt4,,$PATH) | 78 AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) |
79 fi | 79 fi |
80 if test x$QMAKE = x ; then | 80 if test x$QMAKE = x ; then |
81 AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) | 81 AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) |
82 fi | 82 fi |
83 if test x$QMAKE = x ; then | 83 if test x$QMAKE = x ; then |
84 AC_MSG_ERROR([ | 84 AC_MSG_ERROR([ |
85 Failed to find the required qmake-qt4 or qmake program. Please | 85 Failed to find the required qmake-qt5 or qmake program. Please |
86 ensure you have the necessary Qt4 development files installed, and | 86 ensure you have the necessary Qt5 development files installed, and |
87 if necessary set QTDIR to the location of your Qt4 installation. | 87 if necessary set QTDIR to the location of your Qt5 installation. |
88 ]) | 88 ]) |
89 fi | 89 fi |
90 | 90 |
91 # Suitable versions of qmake should print out something like: | 91 # Suitable versions of qmake should print out something like: |
92 # | 92 # |
96 # This may be translated, so we check only for the numbers (2.x and 4.x | 96 # This may be translated, so we check only for the numbers (2.x and 4.x |
97 # in that order). | 97 # in that order). |
98 # | 98 # |
99 QMAKE_VERSION_OUTPUT=`$QMAKE -v` | 99 QMAKE_VERSION_OUTPUT=`$QMAKE -v` |
100 case "$QMAKE_VERSION_OUTPUT" in | 100 case "$QMAKE_VERSION_OUTPUT" in |
101 *2.*4.*) ;; | 101 *5.*) ;; |
102 *) AC_MSG_WARN([ | 102 *) AC_MSG_WARN([ |
103 *** The version of qmake found in "$QMAKE" looks like it might be | 103 *** The version of qmake found in "$QMAKE" looks like it might be |
104 from the wrong version of Qt (Qt4 is required). Please check | 104 from the wrong version of Qt (Qt5 is required). Please check |
105 that this is the correct version of qmake for Qt4 builds. | 105 that this is the correct version of qmake for Qt5 builds. |
106 ]) | 106 ]) |
107 esac | 107 esac |
108 | 108 |
109 case "`uname`" in | 109 case "`uname`" in |
110 *Darwin*) QMAKE="$QMAKE -spec macx-g++";; | 110 *Darwin*) QMAKE="$QMAKE -spec macx-g++";; |