[Cmake-commits] CMake branch, next, updated. v2.8.4-1899-g0e31b65

[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  0e31b654a93ddf29930ce5be2020853220000917 (commit)
       via  0ae8a3405bb32afadda13f43100484e85f7ef74f (commit)
      from  caeb79d42dabfcb6f0a519b7185b0da50e2e645c (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=0e31b654a93ddf29930ce5be2020853220000917
commit 0e31b654a93ddf29930ce5be2020853220000917
Merge: caeb79d 0ae8a34
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Jul 22 15:37:24 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 22 15:37:24 2011 -0400

    Merge topic 'cross-qt4-find-includes' into next
    
    0ae8a34 Add qt4/QtCore to help find Qt headers when cross-compiling.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ae8a3405bb32afadda13f43100484e85f7ef74f
commit 0ae8a3405bb32afadda13f43100484e85f7ef74f
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Jul 22 13:38:36 2011 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Jul 22 13:38:36 2011 -0600

    Add qt4/QtCore to help find Qt headers when cross-compiling.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 86fce9d..a0941ca 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -620,7 +620,7 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
       SET(QT_QTCORE_INCLUDE_DIR NOTFOUND)
       FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
                 HINTS ${qt_headers} ${QT_LIBRARY_DIR}
-                PATH_SUFFIXES QtCore
+                PATH_SUFFIXES QtCore qt4/QtCore
         )
 
       # Set QT_HEADERS_DIR based on finding QtCore header

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

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


hooks/post-receive
-- 
CMake