Attachment 5052 Details for Bug 25926 – Патч модулей (исправленный)

[patch] Патч модулей (исправленный)

cmake.patch (text/plain), 2.95 KB, created by serpiph on 2011-08-20 10:45:17 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: serpiph

Created: 2011-08-20 10:45:17 MSK

Size: 2.95 KB

patch

obsolete

>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-08-20 10:40:56.011831597 +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-08-20 10:41:52.195645357 +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-08-20 10:43:54.200005474 +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)
>@@ -1130,6 +1130,11 @@
> #support old QT_MIN_VERSION if set, but not if version is supplied by find_package()
> IF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
>   SET(Qt4_FIND_VERSION ${QT_MIN_VERSION})
>+  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" Qt4_FIND_VERSION_MAJOR "${QT_MIN_VERSION}")
>+  STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" Qt4_FIND_VERSION_MINOR "${QT_MIN_VERSION}")
>+  STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" Qt4_FIND_VERSION_PATCH "${QT_MIN_VERSION}")
>+  SET(Qt4_FIND_VERSION_TWEAK "0")
>+  SET(Qt4_FIND_VERSION_COUNT "3")
> ENDIF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
> 
> IF( Qt4_FIND_COMPONENTS )

Actions: View | Diff

Attachments on bug 25926: 5014 | 5019 | 5052