diff -Naur cmake-2.8.5.orig/Modules/FindPackageHandleStandardArgs.cmake cmake-2.8.5/Modules/FindPackageHandleStandardArgs.cmake --- cmake-2.8.5.orig/Modules/FindPackageHandleStandardArgs.cmake 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Modules/FindPackageHandleStandardArgs.cmake 2011-07-19 10:46:59.288009661 +0400 @@ -211,7 +211,7 @@ SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"") SET(VERSION_OK FALSE) ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") - SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")") + SET(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")") ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") ENDIF(${_NAME}_FIND_VERSION_EXACT) diff -Naur cmake-2.8.5.orig/Modules/FindQt3.cmake cmake-2.8.5/Modules/FindQt3.cmake --- cmake-2.8.5.orig/Modules/FindQt3.cmake 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Modules/FindQt3.cmake 2011-07-19 10:44:15.288009564 +0400 @@ -206,7 +206,7 @@ ENDIF (NOT req_qt_major_vers) STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}") - STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}") + STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}") STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}") # req = "6.5.4", qt = "3.2.1" diff -Naur cmake-2.8.5.orig/Modules/FindQt4.cmake cmake-2.8.5/Modules/FindQt4.cmake --- cmake-2.8.5.orig/Modules/FindQt4.cmake 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Modules/FindQt4.cmake 2011-07-19 10:44:28.240009571 +0400 @@ -1122,7 +1122,7 @@ # set version variables STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}") - STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") + STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}") ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION) diff -Naur cmake-2.8.5.orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx --- cmake-2.8.5.orig/Source/cmFindPackageCommand.cxx 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-19 12:14:52.768012748 +0400 @@ -1751,6 +1751,7 @@ } result_version = this->Makefile->GetSafeDefinition("PACKAGE_VERSION"); + if(!this->VersionFoundCount) this->Makefile->RemoveDefinition("PACKAGE_FIND_VERSION"); if (result_version.empty()) { result_version = "unknown";