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 b4783c485f96aa08505f11b1b26184eefd135e0e (commit)
via 252bfd33791002465d29028682ea764c47975421 (commit)
from 001a02a662f1ac457c83eb3c565c26c0601fae95 (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=b4783c485f96aa08505f11b1b26184eefd135e0e
commit b4783c485f96aa08505f11b1b26184eefd135e0e
Merge: 001a02a 252bfd3
Author: Brad King <[email protected]>
AuthorDate: Mon Mar 18 09:07:37 2013 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Mar 18 09:07:37 2013 -0400
Merge topic 'findqt4-withqt5' into next
252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4
includes.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=252bfd33791002465d29028682ea764c47975421
commit 252bfd33791002465d29028682ea764c47975421
Author: Clinton Stimpson <[email protected]>
AuthorDate: Fri Mar 15 08:32:43 2013 -0600
Commit: Brad King <[email protected]>
CommitDate: Mon Mar 18 09:06:53 2013 -0400
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)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
