summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2013-03-15 14:32:43 (GMT)
committerBrad King <brad.king@kitware.com>2013-03-18 13:06:53 (GMT)
commit252bfd33791002465d29028682ea764c47975421 (patch)
treed56912e4c55bfb22ab72b3d64b134aa1cbd4b359
parent161a79378136d71ae26d26d78d62d997a4be1672 (diff)
downloadCMake-252bfd33791002465d29028682ea764c47975421.zip
CMake-252bfd33791002465d29028682ea764c47975421.tar.gz
CMake-252bfd33791002465d29028682ea764c47975421.tar.bz2
FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
-rw-r--r--Modules/FindQt4.cmake7
1 files changed, 7 insertions, 0 deletions
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)