[Cmake-commits] CMake branch, next, updated. v2.8.9-115-g9ae27d4

[Clinton Stimpson]

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  9ae27d461399f6bed55d2fa13df0eea7cb2f88e1 (commit)
       via  35c6ae88779432ec69d328ec2b00b97eebf1bb16 (commit)
      from  690d1ae4fbe4d90851dc57af8f2c576852bfac99 (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=9ae27d461399f6bed55d2fa13df0eea7cb2f88e1
commit 9ae27d461399f6bed55d2fa13df0eea7cb2f88e1
Merge: 690d1ae 35c6ae8
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Aug 16 09:34:16 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 16 09:34:16 2012 -0400

    Merge topic 'qt4-path-search' into next
    
    35c6ae8 FindQt4: Give precedence to QTDIR environment variable, if set.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35c6ae88779432ec69d328ec2b00b97eebf1bb16
commit 35c6ae88779432ec69d328ec2b00b97eebf1bb16
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Aug 16 07:31:17 2012 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Aug 16 07:31:17 2012 -0600

    FindQt4: Give precedence to QTDIR environment variable, if set.
    
    Remove old search paths that aren't needed.
    
    Keep using PATHS instead of HINTS because a Windows machine may have
    a different Qt in its PATH and putting QTDIR and the registry entry
    ahead of PATH could cause apps to fail when run.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 726d86c..6886d93 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -486,11 +486,11 @@ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
 # check for qmake
 # Debian uses qmake-qt4
 # macports' Qt uses qmake-mac
-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-  $ENV{QTDIR}/bin
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
+  PATHS
+    ENV QTDIR
+    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
+  PATH_SUFFIXES bin
   DOC "The qmake executable for the Qt installation to use"
 )
 

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

Summary of changes:
 Modules/FindQt4.cmake |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake