[Cmake-commits] CMake branch, next, updated. v2.8.9-98-gf0c775c

[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  f0c775c579b734d07e00f6a4d2fc9b6334356379 (commit)
       via  5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef (commit)
      from  eccdbc8b8da8a3d45f519858ca0639cffbd40ffb (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=f0c775c579b734d07e00f6a4d2fc9b6334356379
commit f0c775c579b734d07e00f6a4d2fc9b6334356379
Merge: eccdbc8 5a6a3d4
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 15 20:21:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 15 20:21:57 2012 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef
commit 5a6a3d4342f835b2d7adf8f1679a2b70bc3897ef
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 15 18:20:16 2012 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Aug 15 18:20:16 2012 -0600

    FindQt4: Give precedence to QTDIR environment variable, if set.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index fac8579..726d86c 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -487,10 +487,10 @@ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
 # 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"
-  $ENV{QTDIR}/bin
   DOC "The qmake executable for the Qt installation to use"
 )
 

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

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


hooks/post-receive
-- 
CMake