diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-10-07 14:35:22 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-10-07 14:35:22 (GMT) |
| commit | db0e1fd6756fc5da5ec046e00ce736fc5e93c094 (patch) | |
| tree | c055440c0b2f5c65d26e4bd35af5b576662c6b97 /Modules/FindQt4.cmake | |
| parent | 1b91be332c886b7e3c1810a8629094f15e1c2a33 (diff) | |
| download | CMake-db0e1fd6756fc5da5ec046e00ce736fc5e93c094.zip CMake-db0e1fd6756fc5da5ec046e00ce736fc5e93c094.tar.gz CMake-db0e1fd6756fc5da5ec046e00ce736fc5e93c094.tar.bz2 | |
ENH: Fix #7784. Fix link of glib when needed.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 566a7a0..714ed8e 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1586,15 +1586,16 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} ) FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} ) - - IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY) - SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} - ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) - ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY) - + MARK_AS_ADVANCED(QT_GLIB_LIBRARY) MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY) ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY) + + IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY) + SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} + ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) + ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY) + ENDIF(QT_QCONFIG MATCHES "glib") ## clock-monotonic, just see if we need to link with rt |