mirror of
https://github.com/reactos/CMake.git
synced 2024-12-02 00:26:18 +00:00
qt4: also find QtUiTools when cross compiling with mingw.
This commit is contained in:
parent
b17a6dd55b
commit
a67be31784
@ -862,10 +862,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
|||||||
)
|
)
|
||||||
ENDFOREACH(QT_MODULE)
|
ENDFOREACH(QT_MODULE)
|
||||||
|
|
||||||
# QtUiTools not with other frameworks with binary installation (in /usr/lib)
|
# QtUiTools is sometimes not in the same directory as the other found libraries
|
||||||
IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
|
# 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})
|
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
|
# 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)
|
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)
|
||||||
|
Loading…
Reference in New Issue
Block a user