diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-18 13:42:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-18 13:42:06 (GMT) |
| commit | 526cbafa4e2bb554ea05758d01db08ee3e555839 (patch) | |
| tree | a9995bd901ce82318494be6b4e750a2a07fd62f5 /Modules/FindQt4.cmake | |
| parent | 68e86af6f749ba0fadf8e7c358e7aa79cb52e8dd (diff) | |
| parent | 252bfd33791002465d29028682ea764c47975421 (diff) | |
| download | CMake-526cbafa4e2bb554ea05758d01db08ee3e555839.zip CMake-526cbafa4e2bb554ea05758d01db08ee3e555839.tar.gz CMake-526cbafa4e2bb554ea05758d01db08ee3e555839.tar.bz2 | |
Merge topic 'findqt4-withqt5'
252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 6fdc20a..21e8e91 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -686,7 +686,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) |