diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-02 19:25:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-02 19:25:26 (GMT) |
| commit | c300ef1c66eafcae3b4ef05f2ec27768feb1e280 (patch) | |
| tree | dda7f6ba9c1de63a8922b96630d1050a5d132069 | |
| parent | 1060aaf08620469d7dcc1b44d36477493793f468 (diff) | |
| parent | bd66cc9d39a1ce1f81e44fca95142ee3842b6501 (diff) | |
| download | CMake-c300ef1c66eafcae3b4ef05f2ec27768feb1e280.zip CMake-c300ef1c66eafcae3b4ef05f2ec27768feb1e280.tar.gz CMake-c300ef1c66eafcae3b4ef05f2ec27768feb1e280.tar.bz2 | |
Merge topic 'qt4-deps-tiff-jpeg-mng'
bd66cc9 Fix build issues cross compiling with static Qt.
| -rw-r--r-- | Modules/Qt4ConfigDependentSettings.cmake | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake index bfb50de..10af3bc 100644 --- a/Modules/Qt4ConfigDependentSettings.cmake +++ b/Modules/Qt4ConfigDependentSettings.cmake @@ -35,10 +35,10 @@ SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY}) IF(Q_WS_WIN) - # On Windows, qconfig.pri has "static" for static library builds - IF(QT_CONFIG MATCHES "static") + # On Windows, qconfig.pri has "shared" for shared library builds + IF(NOT QT_CONFIG MATCHES "shared") SET(QT_IS_STATIC 1) - ENDIF(QT_CONFIG MATCHES "static") + ENDIF(NOT QT_CONFIG MATCHES "shared") ELSE(Q_WS_WIN) # On other platforms, check file extension to know if its static IF(QT_QTCORE_LIBRARY_RELEASE) @@ -75,6 +75,23 @@ IF(QT_QCONFIG MATCHES "system-png") SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${PNG_LIBRARY}) ENDIF(QT_QCONFIG MATCHES "system-png") +## system jpeg +IF(QT_QCONFIG MATCHES "system-jpeg") + find_package(JPEG) + SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${JPEG_LIBRARIES}) +ENDIF(QT_QCONFIG MATCHES "system-jpeg") + +## system tiff +IF(QT_QCONFIG MATCHES "system-tiff") + find_package(TIFF) + SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${TIFF_LIBRARIES}) +ENDIF(QT_QCONFIG MATCHES "system-tiff") + +## system mng +IF(QT_QCONFIG MATCHES "system-mng") + find_library(MNG_LIBRARY NAMES mng) + SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${MNG_LIBRARY}) +ENDIF(QT_QCONFIG MATCHES "system-mng") # for X11, get X11 library directory IF(Q_WS_X11) |