From 4959e3f61366c6b027fe4a0f6e4329cbc10d3f9b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 12 Apr 2006 08:25:42 +0000 Subject: Make it user friendly: - Qt qmake not found! + The installed Qt version 4.1.0-rc1 is too old, at least version 4.1.1 is required svn path=/trunk/KDE/kdelibs/; revision=528959 --- modules/FindQt4.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index b73ed284..40af6e24 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -177,7 +177,7 @@ IF (QT_QMAKE_EXECUTABLE) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) # check that we found the Qt4 qmake, Qt3 qmake output won't match here - STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" qt_version_tmp "${QTVERSION}") + STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}") IF (qt_version_tmp) # we need at least version 4.0.0 @@ -186,7 +186,7 @@ IF (QT_QMAKE_EXECUTABLE) ENDIF (NOT QT_MIN_VERSION) #now parse the parts of the user given version string into variables - STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" req_qt_major_vers "${QT_MIN_VERSION}") + STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" req_qt_major_vers "${QT_MIN_VERSION}") IF (NOT req_qt_major_vers) MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"4.0.1\"") ENDIF (NOT req_qt_major_vers) -- cgit v1.2.1