diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-07-05 07:17:30 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-07-05 07:17:30 +0000 |
| commit | 30c5701434204555389dacb92465e4637e421150 (patch) | |
| tree | 8b5424289f9410dbadaca50e4914d6196674ca58 | |
| parent | 4e325797f8242fa03b9cc802f5b65224c730cac6 (diff) | |
| download | extra-cmake-modules-30c5701434204555389dacb92465e4637e421150.tar.gz extra-cmake-modules-30c5701434204555389dacb92465e4637e421150.tar.bz2 | |
if a wrong qmake has been found, mark it as invalid in the cache, so that it is searched again the next time cmake runs
Alex
svn path=/trunk/KDE/kdelibs/; revision=558318
| -rw-r--r-- | modules/FindQt4.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 456c514f..f415a360 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -974,6 +974,7 @@ IF (QT4_QMAKE_FOUND) ENDIF( NOT Qt4_FIND_QUIETLY) ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) SET( QT4_FOUND "NO") + SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE) IF( Qt4_FIND_REQUIRED) MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!") ENDIF( Qt4_FIND_REQUIRED) @@ -1009,12 +1010,13 @@ IF (QT4_QMAKE_FOUND) SET( QT_QT_LIBRARY "") ELSE(QT4_QMAKE_FOUND) - + + SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE) IF(Qt4_FIND_REQUIRED) IF(QT4_INSTALLED_VERSION_TOO_OLD) MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required") ELSE(QT4_INSTALLED_VERSION_TOO_OLD) - MESSAGE( FATAL_ERROR "Qt qmake not found!") + MESSAGE( FATAL_ERROR "Qt qmake not found!") ENDIF(QT4_INSTALLED_VERSION_TOO_OLD) ELSE(Qt4_FIND_REQUIRED) IF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY) |