diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-31 16:31:05 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-02-01 12:26:21 +0000 |
| commit | 773999816ee250a50f93a6716ef3ea940583b762 (patch) | |
| tree | 253e71a0aae658460d3ebf6a2a3f5fab61c86f51 /src/corelib/configure.cmake | |
| parent | e616976fdf5d3912bbcbced0394330805fec462a (diff) | |
cmake: glib changed name to glib2
Change-Id: I4a86bd3b01e1fe307e9802182df943245a7fce4c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index a30f8d1bca..4c40aa1c28 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -10,8 +10,8 @@ set_property(CACHE INPUT_iconv PROPERTY STRINGS undefined no yes posix sun gnu) #### Libraries -find_package(GLib) -set_package_properties(GLib PROPERTIES TYPE OPTIONAL) +find_package(GLIB2) +set_package_properties(GLIB2 PROPERTIES TYPE OPTIONAL) find_package(ICU COMPONENTS i18n uc data) set_package_properties(ICU PROPERTIES TYPE OPTIONAL) find_package(Libsystemd) @@ -383,7 +383,7 @@ qt_feature("getentropy" PRIVATE qt_feature("glib" PUBLIC PRIVATE LABEL "GLib" AUTODETECT NOT WIN32 - CONDITION GLib_FOUND + CONDITION GLIB2_FOUND ) qt_feature_definition("glib" "QT_NO_GLIB" NEGATE VALUE "1") qt_feature("iconv" PUBLIC PRIVATE |