diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-29 10:23:06 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-29 10:23:06 +0900 |
| commit | 10c317e64ac791189cf7c77b1224a774dad37492 (patch) | |
| tree | 619099d1c4ef095a242f90436c637a9bee13248c /gio/meson.build | |
| parent | 00a8f3da047be5a3af040c6cbf77258e3d561799 (diff) | |
| download | glib-10c317e64ac791189cf7c77b1224a774dad37492.tar.gz glib-10c317e64ac791189cf7c77b1224a774dad37492.tar.bz2 glib-10c317e64ac791189cf7c77b1224a774dad37492.zip | |
Imported Upstream version 2.65.0upstream/2.65.0
Diffstat (limited to 'gio/meson.build')
| -rw-r--r-- | gio/meson.build | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/gio/meson.build b/gio/meson.build index 2ef60eda9..39e246b9b 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -813,6 +813,10 @@ endif schemas_subdir = join_paths('glib-2.0', 'schemas') +libgio_dep = declare_dependency(link_with : libgio, + dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep], + include_directories : [gioinc]) + pkg.generate(libgio, libraries_private : [osx_ldflags], requires : ['glib-2.0', 'gobject-2.0'], @@ -835,6 +839,11 @@ pkg.generate(libgio, description : 'glib I/O library', ) +if meson.version().version_compare('>=0.54.0') + meson.override_dependency('gio-2.0', libgio_dep) +endif + + if host_system == 'windows' pkg.generate(requires : ['gobject-2.0', 'gmodule-no-export-2.0', 'gio-2.0'], subdirs : ['gio-win32-2.0'], @@ -844,6 +853,9 @@ if host_system == 'windows' name : 'GIO Windows specific APIs', description : 'Windows specific headers for glib I/O library', ) + if meson.version().version_compare('>=0.54.0') + meson.override_dependency('gio-win32-2.0', libgio_dep) + endif else pkg.generate(requires : ['gobject-2.0', 'gio-2.0'], subdirs : ['gio-unix-2.0'], @@ -853,12 +865,11 @@ else name : 'GIO unix specific APIs', description : 'unix specific headers for glib I/O library', ) + if meson.version().version_compare('>=0.54.0') + meson.override_dependency('gio-unix-2.0', libgio_dep) + endif endif -libgio_dep = declare_dependency(link_with : libgio, - dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep], - include_directories : [gioinc]) - if host_system == 'windows' # Hack till https://github.com/mesonbuild/meson/issues/2324 is fixed libgiounix_dep = dependency('', required : false) |