diff options
| author | Brad King <brad.king@kitware.com> | 2013-12-09 15:33:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-12-09 15:33:11 (GMT) |
| commit | 1c95ec6316e5f8b411abf79dbf5d4c6f85faf2f2 (patch) | |
| tree | 1e04de93ea4ef76c07302c40e70d5eedd2a2a9d3 /Modules | |
| parent | cedf03b30711a1d93f00eaed0b92dc3538ec660d (diff) | |
| parent | 05c518b3dee430b56a090e34b55c3f8dbfd034d4 (diff) | |
| download | CMake-1c95ec6316e5f8b411abf79dbf5d4c6f85faf2f2.zip CMake-1c95ec6316e5f8b411abf79dbf5d4c6f85faf2f2.tar.gz CMake-1c95ec6316e5f8b411abf79dbf5d4c6f85faf2f2.tar.bz2 | |
Merge topic 'qt4-qmake-exe'
05c518b FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
Diffstat (limited to 'Modules')
| -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 |