ENH: 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 Tested in KDE since Jul 5th: http://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake?rev=558318&view=rev Alex
This commit is contained in:
parent
4167622667
commit
7ab81d187e
|
@ -242,7 +242,8 @@ IF (QT_QMAKE_EXECUTABLE)
|
||||||
SET(QT4_QMAKE_FOUND FALSE)
|
SET(QT4_QMAKE_FOUND FALSE)
|
||||||
|
|
||||||
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
|
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
|
||||||
# check for qt3 qmake and then try and find qmake-qt4 in the path
|
|
||||||
|
# check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
|
||||||
IF("${QTVERSION}" MATCHES "Unknown")
|
IF("${QTVERSION}" MATCHES "Unknown")
|
||||||
SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
|
SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
|
||||||
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS
|
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS
|
||||||
|
@ -1029,12 +1030,14 @@ IF (QT4_QMAKE_FOUND)
|
||||||
ENDIF( NOT Qt4_FIND_QUIETLY)
|
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)
|
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( QT4_FOUND "NO")
|
||||||
|
SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
|
||||||
IF( Qt4_FIND_REQUIRED)
|
IF( Qt4_FIND_REQUIRED)
|
||||||
MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
|
MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
|
||||||
ENDIF( Qt4_FIND_REQUIRED)
|
ENDIF( Qt4_FIND_REQUIRED)
|
||||||
ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
|
ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
|
||||||
SET(QT_FOUND ${QT4_FOUND})
|
SET(QT_FOUND ${QT4_FOUND})
|
||||||
|
|
||||||
|
|
||||||
#######################################
|
#######################################
|
||||||
#
|
#
|
||||||
# Qt configuration
|
# Qt configuration
|
||||||
|
@ -1185,6 +1188,7 @@ IF (QT4_QMAKE_FOUND)
|
||||||
|
|
||||||
ELSE(QT4_QMAKE_FOUND)
|
ELSE(QT4_QMAKE_FOUND)
|
||||||
|
|
||||||
|
SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
|
||||||
IF(Qt4_FIND_REQUIRED)
|
IF(Qt4_FIND_REQUIRED)
|
||||||
IF(QT4_INSTALLED_VERSION_TOO_OLD)
|
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")
|
MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
|
||||||
|
|
Loading…
Reference in New Issue