[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2528-g97fba40

[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  97fba40e31ef055d054cd4f30f2c138eb500e859 (commit)
       via  bd27c648c7adbf323ebfaf8cc9edc844bffcd248 (commit)
       via  db00592a139780daea8050df0a9fc418ee2539f6 (commit)
      from  25d6f1b6f4ea563b97f0663705ecbad15e5b2a8d (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=97fba40e31ef055d054cd4f30f2c138eb500e859
commit 97fba40e31ef055d054cd4f30f2c138eb500e859
Merge: 25d6f1b bd27c64
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 15 10:35:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 15 10:35:05 2013 -0400

    Merge topic 'findqt4-withqt5' into next
    
    bd27c64 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
    db00592 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd27c648c7adbf323ebfaf8cc9edc844bffcd248
commit bd27c648c7adbf323ebfaf8cc9edc844bffcd248
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 15 08:32:43 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Mar 15 08:32:43 2013 -0600

    FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 1dd2782..e0d1dcc 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -685,7 +685,14 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
       find_path(QT_QTCORE_INCLUDE_DIR QtCore
                 HINTS ${qt_headers} ${QT_LIBRARY_DIR}
                 PATH_SUFFIXES QtCore qt4/QtCore
+                NO_DEFAULT_PATH
         )
+      if(NOT QT_QTCORE_INCLUDE_DIR)
+        find_path(QT_QTCORE_INCLUDE_DIR QtCore
+                  HINTS ${qt_headers} ${QT_LIBRARY_DIR}
+                  PATH_SUFFIXES QtCore qt4/QtCore
+          )
+      endif()
 
       # Set QT_HEADERS_DIR based on finding QtCore header
       if(QT_QTCORE_INCLUDE_DIR)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db00592a139780daea8050df0a9fc418ee2539f6
commit db00592a139780daea8050df0a9fc418ee2539f6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 07:54:36 2013 -0400
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Mar 15 08:32:17 2013 -0600

    FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo
    
    The parent commit accidentally referenced QT_QMAKE_QMAKE_EXECUTABLE
    which does not exist.  Use QT_QMAKE_EXECUTABLE instead.
    
    Reported-by: m.hergarden at euphoria-it.nl

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 590a86e..1dd2782 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -561,7 +561,7 @@ function(_QT4_FIND_QMAKE QMAKE_NAMES QMAKE_RESULT VERSION_RESULT)
   endif()
 
 
-  set(${QMAKE_RESULT} "${QT_QMAKE_QMAKE_EXECUTABLE}" PARENT_SCOPE)
+  set(${QMAKE_RESULT} "${QT_QMAKE_EXECUTABLE}" PARENT_SCOPE)
   set(${VERSION_RESULT} "${QTVERSION}" PARENT_SCOPE)
 endfunction()
 

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

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


hooks/post-receive
-- 
CMake