diff options
| author | Simon Sasburg <simon.sasburg@gmail.com> | 2013-12-05 22:21:03 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2013-12-06 15:07:38 (GMT) |
| commit | 05c518b3dee430b56a090e34b55c3f8dbfd034d4 (patch) | |
| tree | 4588bd1b95070f5afe59bba6b675c4d54160dd78 /Modules/FindQt4.cmake | |
| parent | 148a506e334ae247726b7d45afaa1da8a547c67b (diff) | |
| download | CMake-05c518b3dee430b56a090e34b55c3f8dbfd034d4.zip CMake-05c518b3dee430b56a090e34b55c3f8dbfd034d4.tar.gz CMake-05c518b3dee430b56a090e34b55c3f8dbfd034d4.tar.bz2 | |
FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
This fixes a regression in commit 21123416 where it was trying to better handle
a qmake from Qt5.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 46a0355..24747f7 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -738,6 +738,11 @@ _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) if (QT_QMAKE_EXECUTABLE AND QTVERSION) + if (QT_QMAKE_EXECUTABLE_LAST) + string(COMPARE NOTEQUAL "${QT_QMAKE_EXECUTABLE_LAST}" "${QT_QMAKE_EXECUTABLE}" QT_QMAKE_CHANGED) + endif() + set(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE) + _qt4_get_version_components("${QTVERSION}" QT_VERSION_MAJOR QT_VERSION_MINOR QT_VERSION_PATCH) # ask qmake for the mkspecs directory |