diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2007-11-08 15:56:13 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2007-11-08 15:56:13 (GMT) |
| commit | 46bdfe1d7be4218aeb1113ff0c1f257ca7b9f3d9 (patch) | |
| tree | eddfee3603c9c537da2506ddf7072c4c1265f5d2 /Modules/FindQt4.cmake | |
| parent | 4e752dee910d3901a438d97aedf49357a8cb5628 (diff) | |
| download | CMake-46bdfe1d7be4218aeb1113ff0c1f257ca7b9f3d9.zip CMake-46bdfe1d7be4218aeb1113ff0c1f257ca7b9f3d9.tar.gz CMake-46bdfe1d7be4218aeb1113ff0c1f257ca7b9f3d9.tar.bz2 | |
ENH: Add support for static Qt 4.3 builds.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 110de2e..d8abca3 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1171,6 +1171,13 @@ IF (QT4_QMAKE_FOUND) MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY) ENDIF(QT_QCONFIG MATCHES "xinerama") + ## Xfixes + IF(QT_QCONFIG MATCHES "xfixes") + FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11}) + SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY}) + MARK_AS_ADVANCED(QT_XFIXES_LIBRARY) + ENDIF(QT_QCONFIG MATCHES "xfixes") + ## system-freetype IF(QT_QCONFIG MATCHES "system-freetype") FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype) @@ -1191,14 +1198,31 @@ IF (QT4_QMAKE_FOUND) SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY}) MARK_AS_ADVANCED(QT_ZLIB_LIBRARY) ENDIF(QT_QCONFIG MATCHES "system-zlib") + ## glib IF(QT_QCONFIG MATCHES "glib") # Qt less than Qt 4.2.0 doesn't use glib - # Qt 4.2.0 uses glib-2.0 (wish we could ask Qt that) + # Qt 4.2.0 uses glib-2.0 (wish we could ask Qt that it uses 2.0) FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0) - SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_GLIB_LIBRARY}) + FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0) + SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} + ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) MARK_AS_ADVANCED(QT_GLIB_LIBRARY) + MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY) ENDIF(QT_QCONFIG MATCHES "glib") + + ## clock-monotonic, just see if we need to link with rt + IF(QT_QCONFIG MATCHES "clock-monotonic") + SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) + SET(CMAKE_REQUIRED_LIBRARIES rt) + CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS) + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) + IF(QT_POSIX_TIMERS) + FIND_LIBRARY(QT_RT_LIBRARY NAMES rt) + SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY}) + MARK_AS_ADVANCED(QT_RT_LIBRARY) + ENDIF(QT_POSIX_TIMERS) + ENDIF(QT_QCONFIG MATCHES "clock-monotonic") IF(Q_WS_X11) # X11 libraries Qt absolutely depends on |