[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3299-g731b451

[Brad King]

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  731b451ca24a1b7e6ceacc6ff37d9d7e572c0864 (commit)
       via  0645eedb7150aa28f52161abc3f8ef2256aafb54 (commit)
      from  3d779aa2dd9ebf297a5785c8f6c105415dca148f (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=731b451ca24a1b7e6ceacc6ff37d9d7e572c0864
commit 731b451ca24a1b7e6ceacc6ff37d9d7e572c0864
Merge: 3d779aa 0645eed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 22 08:58:14 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 22 08:58:14 2014 -0400

    Merge topic 'FindQt_versioned_tools' into next
    
    0645eedb FindQt[34]: Prefer matching versioned tool names


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0645eedb7150aa28f52161abc3f8ef2256aafb54
commit 0645eedb7150aa28f52161abc3f8ef2256aafb54
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue May 20 17:47:54 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 22 08:56:05 2014 -0400

    FindQt[34]: Prefer matching versioned tool names
    
    After finding qmake we search in QT_BINARY_DIR for the other Qt tools.
    Try all versioned executable names before trying the plain executable name.
    This makes it much more likely that if 2 different major versions are installed
    in the same prefix CMake will be able to detect a proper set of tools.

diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 4fc6829..86997ba 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -161,7 +161,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
 
 # Qt 3 should prefer QTDIR over the PATH
 find_program(QT_MOC_EXECUTABLE
-  NAMES moc-qt3 moc moc3 moc3-mt
+  NAMES moc-qt3 moc3 moc3-mt moc
   HINTS
     ENV QTDIR
   PATHS
@@ -186,7 +186,7 @@ endif()
 
 # Qt 3 should prefer QTDIR over the PATH
 find_program(QT_UIC_EXECUTABLE
-  NAMES uic-qt3 uic uic3 uic3-mt
+  NAMES uic-qt3 uic3 uic3-mt uic
   HINTS
     ENV QTDIR
   PATHS
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e44d1d9..9487a62 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1137,17 +1137,17 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
     endif()
   endmacro()
 
-  _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc moc4)
-  _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic uic4)
+  _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
+  _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
   _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
   _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
   _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)
   _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp)
-  _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate lupdate4)
-  _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease lrelease4)
+  _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate)
+  _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease)
   _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)
-  _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer designer4)
-  _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist linguist4)
+  _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer)
+  _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist)
 
   if (NOT TARGET Qt4::qmake)
     add_executable(Qt4::qmake IMPORTED)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake