diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2011-08-29 14:23:44 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2011-08-29 14:23:44 (GMT) |
| commit | a67be31784ca6e2683fb5b86988bc5c81680c07c (patch) | |
| tree | ca5306d9c7c9414e59fab8e77a0a956dd43336f6 /Modules/FindQt4.cmake | |
| parent | b17a6dd55b94179fb87f27255f918a7d82ea57e5 (diff) | |
| download | CMake-a67be31784ca6e2683fb5b86988bc5c81680c07c.zip CMake-a67be31784ca6e2683fb5b86988bc5c81680c07c.tar.gz CMake-a67be31784ca6e2683fb5b86988bc5c81680c07c.tar.bz2 | |
qt4: also find QtUiTools when cross compiling with mingw.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 1ebd69d..3b05c2b 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -862,10 +862,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) ) ENDFOREACH(QT_MODULE) - # QtUiTools not with other frameworks with binary installation (in /usr/lib) - IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) + # QtUiTools is sometimes not in the same directory as the other found libraries + # e.g. on Mac, its never a framework like the others are + IF(QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR}) - ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) + ENDIF(QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) # Set QT_QTDESIGNERCOMPONENTS_LIBRARY FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) |