-configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
- install : true,
+glibconfig_h = configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'),
configuration : glibconfig_conf)
subdir('libcharset')
-if not use_system_pcre
- subdir('pcre')
-endif
-# TODO: gnulib_objects, pcre_objects and pcre_deps are a workaround for
-# <https://github.com/mesonbuild/meson/issues/3934> and
-# <https://github.com/mesonbuild/meson/issues/3937>. When we can depend
-# on a meson version where those are fixed, revert the commit that
-# introduced this workaround.
-if have_good_vsnprintf and have_good_snprintf
+# libsysprof-capture support
+libsysprof_capture_dep = dependency('sysprof-capture-4', version: '>= 3.38.0',
+ required: get_option('sysprof'),
+ default_options: [
+ 'enable_examples=false',
+ 'enable_gtk=false',
+ 'enable_tests=false',
+ 'enable_tools=false',
+ 'libsysprof=false',
+ 'with_sysprofd=none',
+ 'help=false',
+ ],
+ fallback: ['sysprof', 'libsysprof_capture_dep'],
+)
+glib_conf.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
+
+if use_system_printf
gnulib_lib = []
- gnulib_objects = []
gnulib_libm_dependency = []
glib_conf.set ('gl_unused', '')
glib_conf.set ('gl_extern_inline', '')
glib_conf.set('NEED_PRINTF_INFINITE_DOUBLE', 1)
endif
- if gl_cv_func_printf_long_double and gl_cv_func_printf_infinite_long_double != 'false'
+ if gl_cv_func_printf_long_double and gl_cv_func_printf_infinite_long_double
glib_conf.set('NEED_PRINTF_INFINITE_LONG_DOUBLE', 1)
endif
subdir('gnulib')
- gnulib_objects = [gnulib_lib.extract_all_objects()]
endif
glib_headers = files(
)
install_headers(glib_headers, subdir : 'glib-2.0')
+# Expose as variable to be used by gobject-introspection
+# when it includes GLib as a subproject
+glib_unix_h = files('glib-unix.h')
+
glib_deprecated_headers = files(
'deprecated/gallocator.h',
'deprecated/gcache.h',
glib_sub_headers = files(
'glib-autocleanups.h',
+ 'glib-typeof.h',
'galloca.h',
'garray.h',
'gasyncqueue.h',
'gspawn.h',
'gstdio.h',
'gstrfuncs.h',
+ 'gstrvbuilder.h',
'gtestutils.h',
'gstring.h',
'gstringchunk.h',
'gtypes.h',
'guuid.h',
'gunicode.h',
- 'gurifuncs.h',
+ 'guri.h',
'gutils.h',
'gvarianttype.h',
'gvariant.h',
'gstrfuncs.c',
'gstring.c',
'gstringchunk.c',
+ 'gstrvbuilder.c',
'gtestutils.c',
'gthread.c',
'gthreadpool.c',
'gtimer.c',
'gtimezone.c',
+ 'gtrace.c',
+ 'gtrace-private.h',
'gtranslit.c',
'gtrashstack.c',
'gtree.c',
'gunibreak.c',
'gunicollate.c',
'gunidecomp.c',
- 'gurifuncs.c',
+ 'guri.c',
+ 'guriprivate.h',
'gutils.c',
'gutilsprivate.h',
'guuid.c',
'gprintf.c',
)
+platform_deps = []
+
if host_system == 'windows'
- glib_win_rc = configure_file(
- input: 'glib.rc.in',
- output: 'glib.rc',
- configuration: glibconfig_conf,
- )
- glib_win_res = windows.compile_resources(glib_win_rc)
- glib_sources += [glib_win_res]
+ if get_option('default_library') == 'shared'
+ glib_win_rc = configure_file(
+ input: 'glib.rc.in',
+ output: 'glib.rc',
+ configuration: glibconfig_conf,
+ )
+ glib_win_res = windows.compile_resources(glib_win_rc)
+ glib_sources += [glib_win_res]
+ endif
glib_sources += files('gwin32.c', 'gspawn-win32.c', 'giowin32.c')
platform_deps = [winsock2, cc.find_library('winmm')]
- if cc.get_id() == 'msvc'
+ if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
glib_sources += files('dirent/wdirent.c')
endif
else
platform_deps = []
endif
-if host_system == 'darwin'
+if glib_have_cocoa
glib_sources += files('gosxutils.m')
+ framework_dep = dependency('appleframeworks', modules : ['Foundation', 'CoreFoundation', 'AppKit'])
+ platform_deps += [framework_dep]
+endif
+
+if glib_have_carbon
+ framework_dep = dependency('appleframeworks', modules : 'Carbon')
+ platform_deps += [framework_dep]
endif
glib_sources += files('gthread-@0@.c'.format(threads_implementation))
pcre_static_args = ['-DPCRE_STATIC']
endif
-if use_system_pcre
- pcre_deps = [pcre]
- pcre_objects = []
-else
- pcre_deps = []
- pcre_objects = [libpcre.extract_all_objects()]
-endif
-
glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre_static_args + glib_hidden_visibility_args
libglib = library('glib-2.0',
glib_dtrace_obj, glib_dtrace_hdr,
sources : [deprecated_sources, glib_sources],
- objects : [charset_lib.extract_all_objects()] + gnulib_objects + pcre_objects,
version : library_version,
soversion : soversion,
darwin_versions : darwin_versions,
# intl.lib is not compatible with SAFESEH
link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
include_directories : configinc,
- dependencies : pcre_deps + [thread_dep, libintl, librt] + libiconv + platform_deps + gnulib_libm_dependency,
+ link_with: [charset_lib, gnulib_lib],
+ dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
c_args : glib_c_args,
objc_args : glib_c_args,
)
libglib_dep = declare_dependency(
link_with : libglib,
- # thread_dep doesn't get pulled in from libglib atm,
- # see https://github.com/mesonbuild/meson/issues/1426
- dependencies : [thread_dep, libintl],
+ dependencies : libintl_deps,
# We sadly need to export configinc here because everyone includes <glib/*.h>
include_directories : [configinc, glibinc])
pkg.generate(libglib,
- libraries : [libintl],
- libraries_private : [osx_ldflags, win32_ldflags],
+ libraries : [libintl_deps],
+ libraries_private : [win32_ldflags],
subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
description : 'C Utility Library',
)
+if meson.version().version_compare('>=0.54.0')
+ meson.override_dependency('glib-2.0', libglib_dep)
+endif
+
# On Windows, glib needs a spawn helper for g_spawn* API
if host_system == 'windows'
if host_machine.cpu_family() == 'x86'
install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
+# This is needed to make gdb find glib_gdb.py
+if meson.version().version_compare('>=0.58')
+ env = environment()
+ env.prepend('PYTHONPATH', meson.current_source_dir())
+ meson.add_devenv(env)
+endif
+
gdb_conf = configuration_data()
gdb_conf.set('datadir', glib_datadir)
# This is also used in gobject/meson.build
if host_system != 'windows'
- # XXX: We add a leading './' because glib_libdir is an absolute path and we
- # need it to be a relative path so that join_paths appends it to the end.
- gdb_install_dir = join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+ gdb_install = true
else
# FIXME: Cannot install on Windows because the path will contain a drive
# letter and colons are not allowed in paths.
- gdb_install_dir = false
+ gdb_install = false
endif
+
+# XXX: We add a leading './' because glib_libdir is an absolute path and we
+# need it to be a relative path so that join_paths appends it to the end.
+gdb_install_dir = join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir)
+
configure_file(
input: 'libglib-gdb.py.in',
output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version),
configuration: gdb_conf,
install_dir: gdb_install_dir,
+ install: gdb_install,
)
if enable_systemtap
output : '@0@.stp'.format(libglib.full_path().split('/').get(-1)),
configuration : stp_cdata,
install_dir : tapset_install_dir,
- install : true)
+ )
endif
-# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests
subdir('tests')
-endif
\ No newline at end of file
+endif
projects / platform / upstream / glib.git / blobdiff