1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't attempt to ask cmake to find the glib dependencies.

Browse Source 
Those components are not known to FindGTK2.cmake.

Change-Id: I4a7fe35d7d118168c24285f3ea8f57822b2facff
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Stephen Kelly 2012-04-27 16:06:26 +02:00 committed by Qt by Nokia
parent 2cea0042d0
commit 27ca259fb6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/cmake/Qt5BasicConfig.cmake.in
View File

@ -65,8 +65,11 @@ list(APPEND Qt5Core_LIB_DEPENDENCIES ${ZLIB_LIBRARIES})
!!ENDIF
!!IF contains(QT_CONFIG, glib)
find_package(GTK2 REQUIRED glib-2.0 gthread-2.0)
list(APPEND Qt5Core_LIB_DEPENDENCIES ${GTK2_LIBRARIES})
find_library(QT_GLIB_LIBRARY NAMES glib-2.0 )
find_library(QT_GTHREAD_LIBRARY NAMES gthread-2.0 )
mark_as_advanced(QT_GLIB_LIBRARY)
mark_as_advanced(QT_GTHREAD_LIBRARY)
list(APPEND Qt5Core_LIB_DEPENDENCIES ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
!!ENDIF
!!IF contains(QT_CONFIG, clock-monotonic)