Re: [devel] qutIM и непонятки с cmake

[Sergei Epiphanov <serpiph@nikiet.ru>]

[-- Attachment #1: Type: Text/Plain, Size: 585 bytes --]

В сообщении от 19 июля 2011 10:05:09 автор REAL написал:
> 19.07.2011 12:50, REAL пишет:
> > Больше похоже на "баг" в qutim. В кавычках потому, что он требует
> > конкретную версию Qt4. Надо попробовать убрать проверку версии.
> 
> Хотя нет, проблема уходит в cmake-modules (дальше не смотрел).

Я тут ради интереса покопался. Во-первых, есть 2 ошибки с FindQt3.cmake и 
FindQt4.cmake. Патч приложен. Также там исправлен текст строки, которой Вас 
пугает.

Далее, используется файл /usr/share/kde4/apps/cmake/modules/FindQt4.cmake. 
Патч прилагается.

-- 
С уважением, Епифанов Сергей

[-- Attachment #2: FindQt4.cmake.patch --]
[-- Type: text/x-patch, Size: 654 bytes --]

--- FindQt4.cmake.sav	2011-07-04 20:30:47.000000000 +0400
+++ FindQt4.cmake	2011-07-19 11:43:06.976011733 +0400
@@ -505,9 +505,9 @@
     # source-compatible with CMake 2.6.x
     IF( Qt4_FIND_VERSION )
       SET( QT_MIN_VERSION ${Qt4_FIND_VERSION} )
-      SET( req_qt_major_vers ${Qt4_FIND_VERSION_MAJOR} )
-      SET( req_qt_minor_vers ${Qt4_FIND_VERSION_MINOR} )
-      SET( req_qt_patch_vers ${Qt4_FIND_VERSION_PATCH} )
+      SET( req_qt_major_vers ${QT_VERSION_MAJOR} )
+      SET( req_qt_minor_vers ${QT_VERSION_MINOR} )
+      SET( req_qt_patch_vers ${QT_VERSION_PATCH} )
     ENDIF( Qt4_FIND_VERSION )
 
     IF (NOT req_qt_major_vers EQUAL 4)

[-- Attachment #3: cmake-2.8.5.patch --]
[-- Type: text/x-patch, Size: 2355 bytes --]

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)