From 252bfd33791002465d29028682ea764c47975421 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Fri, 15 Mar 2013 08:32:43 -0600 Subject: [PATCH] FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes. --- Modules/FindQt4.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 1dd2782ed..e0d1dccc7 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)