diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2010-09-23 16:50:09 -0600 |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2010-09-23 16:50:09 -0600 |
| commit | 25931ae10ed6b3bddc242ace16bed82dd2683596 (patch) | |
| tree | 924067d0f6f50d74b651453c52688a5feee5cad1 /Modules | |
| parent | c0194278ac9d96aac19d9ea928883302d155faec (diff) | |
| download | cmake-25931ae10ed6b3bddc242ace16bed82dd2683596.tar.gz | |
Fix regression in cross-compile patches with finding Qt libs.
If a Qt installation is in CMAKE_PREFIX_PATH and a
QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation,
prefer finding libs in the latter Qt installation.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 0a813a41d6..c939ddc788 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -602,10 +602,12 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4 HINTS ${QT_LIBRARY_DIR_TMP} + NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH ) FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCore${QT_LIBINFIX}_debug QtCore${QT_LIBINFIX}d QtCore${QT_LIBINFIX}d4 HINTS ${QT_LIBRARY_DIR_TMP} + NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH ) # try dropping a hint if trying to use Visual Studio with Qt built by mingw @@ -630,7 +632,7 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTCORE_FOUND 1) ELSE() MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}") - MESSAGE("Warning: But QtCore couldn't be found. Qt must NOT be installed correctly.") + MESSAGE("Warning: But QtCore couldn't be found. Qt must NOT be installed correctly, or it wasn't found for cross compiling.") IF(Qt4_FIND_REQUIRED) MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.") ENDIF(Qt4_FIND_REQUIRED) |