[Cmake-commits] CMake branch, next, updated. v2.8.7-2749-ga9dd6f0

[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  a9dd6f0248572cc14896970b2a6d45a504a9333c (commit)
       via  f5066217db3911754006ae64e2a9001382ff66e1 (commit)
       via  dc4c24ac79e739212004e66acc33996f6b3431cf (commit)
      from  9c12f1cbb0067670a32f246b9cfdb2c51ac024c8 (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=a9dd6f0248572cc14896970b2a6d45a504a9333c
commit a9dd6f0248572cc14896970b2a6d45a504a9333c
Merge: 9c12f1c f506621
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Feb 20 15:01:36 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 15:01:36 2012 -0500

    Merge topic 'qt3-find-qtmain' into next
    
    f506621 Fix paths/hints for finding qtmain.
    dc4c24a KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5066217db3911754006ae64e2a9001382ff66e1
commit f5066217db3911754006ae64e2a9001382ff66e1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Feb 20 13:02:11 2012 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Feb 20 13:02:11 2012 -0700

    Fix paths/hints for finding qtmain.

diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index bacbb07..86236cc 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -183,11 +183,14 @@ ENDIF(QT_UIC_EXECUTABLE)
 
 IF (WIN32)
   FIND_LIBRARY(QT_QTMAIN_LIBRARY qtmain
+    HINTS
+    $ENV{QTDIR}/lib
     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
+    PATHS
     "$ENV{ProgramFiles}/qt/lib"
-    $ENV{QTDIR}/lib "C:/Program Files/qt/lib"
+    "C:/Program Files/qt/lib"
     DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
     )
 ENDIF (WIN32)

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

Summary of changes:
 Modules/FindQt3.cmake             |    5 ++++-
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake