From c19deb1e9c1d2009b1cbf8eb53fa2f09c215506e Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 9 Apr 2006 17:21:55 +0000 Subject: -better error handling in FindQt4.cmake -use add_custom_command instead of add_custom_target(), saves one line of code Alex svn path=/trunk/KDE/kdelibs/; revision=527955 --- modules/FindQt4.cmake | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'modules/FindQt4.cmake') diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index cedcdb3c..b73ed284 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -167,6 +167,9 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS $ENV{QTDIR}/bin ) +SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE) + + IF (QT_QMAKE_EXECUTABLE) SET(QT4_QMAKE_FOUND FALSE) @@ -208,7 +211,7 @@ IF (QT_QMAKE_EXECUTABLE) IF (found_vers LESS req_vers) SET(QT4_QMAKE_FOUND FALSE) - MESSAGE(FATAL_ERROR "The installed QT version (${QTVERSION}) is to old , at least version (${QT_MIN_VERSION}) is required") + SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE) ELSE (found_vers LESS req_vers) SET(QT4_QMAKE_FOUND TRUE) ENDIF (found_vers LESS req_vers) @@ -824,11 +827,16 @@ IF (QT4_QMAKE_FOUND) ELSE(QT4_QMAKE_FOUND) - IF(QT_QMAKE_EXECUTABLE) - MESSAGE("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.") - ENDIF(QT_QMAKE_EXECUTABLE) - IF(Qt4_FIND_REQUIRED) - MESSAGE( FATAL_ERROR "Qt qmake not found!") - ENDIF(Qt4_FIND_REQUIRED) + 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!") + ENDIF(QT4_INSTALLED_VERSION_TOO_OLD) + ELSE(Qt4_FIND_REQUIRED) + IF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY) + MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required") + ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY) + ENDIF(Qt4_FIND_REQUIRED) ENDIF (QT4_QMAKE_FOUND) -- cgit v1.2.1