From: Sergei Epiphanov <serpiph@nikiet.ru> To: ALT Linux Team development discussions <devel@lists.altlinux.org> Subject: Re: [devel] qutIM и непонятки с cmake Date: Tue, 19 Jul 2011 12:19:45 +0400 Message-ID: <201107191219.46072.serpiph@nikiet.ru> (raw) In-Reply-To: <201107191155.44281.serpiph@nikiet.ru> [-- Attachment #1: Type: Text/Plain, Size: 575 bytes --] Прошу прощения за шторм писем. Поглядите в приложенный файл. В общем, программа cmake сейчас создаёт параметр PACKAGE_FIND_VERSION в любом случае (даже если версия не указана), хотя во всех описаниях написано, что эта переменная есть только при реальном наличии указания версии. Частичный ответ в файле.Прошу подойти к нему очень скурпулёзно и или оценить предложенное изменение (исходный код), или править .cmake-файлы под новые нужды. Сразу говорю, что я лишь указал место, где стоит вопрос, более знающих прошу дать свой вердикт. -- С уважением, Епифанов Сергей [-- Attachment #2: cmake-2.8.5.patch --] [-- Type: text/x-patch, Size: 2898 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) 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";
next prev parent reply other threads:[~2011-07-19 8:19 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-18 20:53 Nazarov Denis 2011-07-18 21:03 ` Dubrovskiy Viacheslav 2011-07-19 5:46 ` Nazarov Denis 2011-07-19 5:50 ` REAL 2011-07-19 6:05 ` REAL 2011-07-19 7:46 ` Sergei Epiphanov 2011-07-19 7:55 ` Sergei Epiphanov 2011-07-19 8:19 ` Sergei Epiphanov [this message] 2011-07-19 8:28 ` REAL 2011-07-19 9:44 ` Sergei Epiphanov 2011-07-19 9:51 ` REAL 2011-07-19 9:54 ` Sergei Epiphanov 2011-07-19 7:29 ` Ivan A. Melnikov 2011-07-19 9:54 ` Sergei Epiphanov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=201107191219.46072.serpiph@nikiet.ru \ --to=serpiph@nikiet.ru \ --cc=devel@lists.altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
ALT Linux Team development discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \ devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru public-inbox-index devel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git