This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via d102dcba4b7e801559e9b92089cf0db2b649da41 (commit) via 041fb29bd7b25a03ecf5aab2bb6737a10ab21e67 (commit) via 7bb9395974c2edb078db908cc9c7f1c5752e2aff (commit) from 8f903ca241e6e538243ade69dddba1b228841b68 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d102dcba4b7e801559e9b92089cf0db2b649da41 commit d102dcba4b7e801559e9b92089cf0db2b649da41 Merge: 8f903ca 041fb29 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Wed Oct 24 14:20:32 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Oct 24 14:20:32 2012 -0400 Merge topic 'FindQt-version-selection' into next 041fb29 FindQt: add some more places to look for Qt3 7bb9395 FindQt: improve version selection http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=041fb29bd7b25a03ecf5aab2bb6737a10ab21e67 commit 041fb29bd7b25a03ecf5aab2bb6737a10ab21e67 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Wed Oct 24 19:52:58 2012 +0200 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Wed Oct 24 20:19:54 2012 +0200 FindQt: add some more places to look for Qt3 Qt3 may be e.g. in /usr/lib64/qt-3 or in /usr/lib/qt3, too. diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 1a2e16c..5af3125 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -31,7 +31,7 @@ # License text for the above reference.) # look for signs of qt3 installations -file(GLOB GLOB_TEMP_VAR /usr/lib/qt-3*/bin/qmake) +file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake) if(GLOB_TEMP_VAR) set(QT3_INSTALLED TRUE) endif() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bb9395974c2edb078db908cc9c7f1c5752e2aff commit 7bb9395974c2edb078db908cc9c7f1c5752e2aff Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Wed Oct 24 19:50:47 2012 +0200 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Wed Oct 24 20:19:50 2012 +0200 FindQt: improve version selection -make "find_package(Qt 3)" work -if DESIRED_QT_VERSION was set, but only the other Qt major version was found don't override the DESIRED_QT_VERSION set by the user diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 13f18fe..1a2e16c 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -56,6 +56,10 @@ if(GLOB_TEMP_VAR) endif() set(GLOB_TEMP_VAR) +if (Qt_FIND_VERSION) + set(DESIRED_QT_VERSION "${Qt_FIND_VERSION}") +endif () + # now find qmake find_program(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") if(QT_QMAKE_EXECUTABLE_FINDQT) @@ -113,15 +117,15 @@ if(QT3_QGLOBAL_H_FILE) set(QT3_INSTALLED TRUE) endif() -if(QT3_INSTALLED AND QT4_INSTALLED ) +if(QT3_INSTALLED AND QT4_INSTALLED AND NOT DESIRED_QT_VERSION) # force user to pick if we have both set(DESIRED_QT_VERSION 0 CACHE STRING "Pick a version of Qt to use: 3 or 4") else() # if only one found then pick that one - if(QT3_INSTALLED) + if(QT3_INSTALLED AND NOT DESIRED_QT_VERSION EQUAL 4) set(DESIRED_QT_VERSION 3 CACHE STRING "Pick a version of Qt to use: 3 or 4") endif() - if(QT4_INSTALLED) + if(QT4_INSTALLED AND NOT DESIRED_QT_VERSION EQUAL 3) set(DESIRED_QT_VERSION 4 CACHE STRING "Pick a version of Qt to use: 3 or 4") endif() endif() ----------------------------------------------------------------------- Summary of changes: Modules/FindQt.cmake | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits