diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-01 19:14:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-01 19:14:30 (GMT) |
| commit | f6dce05bef7021c9b96b8760e2318cb0c4d679d9 (patch) | |
| tree | 41b30e1c880b4a8f4cde01128abe8e26f145f63f | |
| parent | 1aa42978a50417a0105270692dd46b31861cfff2 (diff) | |
| parent | a67be31784ca6e2683fb5b86988bc5c81680c07c (diff) | |
| download | CMake-f6dce05bef7021c9b96b8760e2318cb0c4d679d9.zip CMake-f6dce05bef7021c9b96b8760e2318cb0c4d679d9.tar.gz CMake-f6dce05bef7021c9b96b8760e2318cb0c4d679d9.tar.bz2 | |
Merge topic 'qt4-find-uitools-mingw-cross'
a67be31 qt4: also find QtUiTools when cross compiling with mingw.
| -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) |