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

cmake: glib changed name to glib2

Browse Source 
Change-Id: I4a86bd3b01e1fe307e9802182df943245a7fce4c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Albert Astals Cid 2019-01-31 16:31:05 +01:00 committed by Tobias Hunger
parent e616976fdf
commit 773999816e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/CMakeLists.txt
View File

@ -528,7 +528,7 @@ extend_target(Core CONDITION UNIX AND QT_FEATURE_clock_gettime
extend_target(Core CONDITION QT_FEATURE_glib extend_target(Core CONDITION QT_FEATURE_glib
SOURCES SOURCES
kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h
LIBRARIES PkgConfig::GLib LIBRARIES GLIB2::GLIB2
) )
## poll_select: ## poll_select:

6
src/corelib/configure.cmake
View File

@ -10,8 +10,8 @@ set_property(CACHE INPUT_iconv PROPERTY STRINGS undefined no yes posix sun gnu)
#### Libraries #### Libraries
find_package(GLib) find_package(GLIB2)
set_package_properties(GLib PROPERTIES TYPE OPTIONAL) set_package_properties(GLIB2 PROPERTIES TYPE OPTIONAL)
find_package(ICU COMPONENTS i18n uc data) find_package(ICU COMPONENTS i18n uc data)
set_package_properties(ICU PROPERTIES TYPE OPTIONAL) set_package_properties(ICU PROPERTIES TYPE OPTIONAL)
find_package(Libsystemd) find_package(Libsystemd)
@ -383,7 +383,7 @@ qt_feature("getentropy" PRIVATE
qt_feature("glib" PUBLIC PRIVATE qt_feature("glib" PUBLIC PRIVATE
LABEL "GLib" LABEL "GLib"
AUTODETECT NOT WIN32 AUTODETECT NOT WIN32
CONDITION GLib_FOUND CONDITION GLIB2_FOUND
) )
qt_feature_definition("glib" "QT_NO_GLIB" NEGATE VALUE "1") qt_feature_definition("glib" "QT_NO_GLIB" NEGATE VALUE "1")
qt_feature("iconv" PUBLIC PRIVATE qt_feature("iconv" PUBLIC PRIVATE

4
src/platformsupport/eventdispatchers/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from eventdispatchers.pro. # Generated from eventdispatchers.pro.
find_package(GLib) find_package(GLIB2)
set_package_properties(GLib PROPERTIES TYPE OPTIONAL) set_package_properties(GLib PROPERTIES TYPE OPTIONAL)
##################################################################### #####################################################################
@ -35,5 +35,5 @@ extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
SOURCES SOURCES
qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
LIBRARIES LIBRARIES
PkgConfig::GLib GLIB2::GLIB2
) )