luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-21 01:47:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add OS profile app to executables

Browse Source 
Fixes #3733
This commit is contained in:
Luca Bacci
2025-08-28 14:54:09 +02:00
parent c836a71114
commit 663ee11fda
18 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzing/meson.build
View File

@@ -47,7 +47,7 @@ fuzz_targets = [
'fuzz_variant_text',
]
deps = [libgmodule_dep, libgio_dep, libglib_dep, libgobject_dep]
deps = [libgmodule_dep, libgio_dep, libglib_dep, libgobject_dep, app_profile_dep]
extra_sources = []
extra_c_args = cc.get_supported_arguments('-Werror=unused-function')

17
gio/meson.build
View File

@@ -426,6 +426,7 @@ if host_system != 'windows'
endif
gio_launch_desktop = executable('gio-launch-desktop', launch_desktop_sources,
dependencies: [app_profile_dep],
include_directories : glibinc,
install : true,
install_dir : multiarch_libexecdir,
@@ -1039,14 +1040,14 @@ gio_tool = executable('gio', gio_tool_sources,
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep])
executable('gresource', 'gresource-tool.c',
install : true,
install_tag : 'bin',
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep])
gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
install : true,
@@ -1055,7 +1056,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep])
glib_compile_schemas = executable('glib-compile-schemas',
['glib-compile-schemas.c'],
@@ -1064,7 +1065,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
install_tag : 'bin',
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep])
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep, app_profile_dep])
glib_compile_resources = executable('glib-compile-resources',
[gconstructor_as_data_h, 'glib-compile-resources.c'],
@@ -1073,7 +1074,7 @@ glib_compile_resources = executable('glib-compile-resources',
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep])
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep, app_profile_dep])
install_data('gresource.dtd',
install_dir: get_option('datadir') / dtds_subdir,
install_tag: 'devel',
@@ -1094,7 +1095,7 @@ executable('gsettings', 'gsettings-tool.c',
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep])
install_data('gschema.dtd',
install_dir : get_option('datadir') / schemas_subdir,
install_tag : 'devel',
@@ -1111,7 +1112,7 @@ executable('gdbus', 'gdbus-tool.c',
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep])
if host_system != 'windows' and not glib_have_cocoa
executable('gapplication', 'gapplication-tool.c',
@@ -1120,7 +1121,7 @@ if host_system != 'windows' and not glib_have_cocoa
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep])
endif
if enable_systemtap

6
gio/tests/meson.build
View File

@@ -635,7 +635,7 @@ if host_machine.system() != 'windows'
# This test is currently unreliable
executable('gdbus-overflow', 'gdbus-overflow.c',
c_args : test_c_args,
dependencies : common_gio_tests_deps,
dependencies : common_gio_tests_deps + [app_profile_dep],
install_dir : installed_tests_execdir,
install_tag : 'tests',
install : installed_tests_enabled)
@@ -1129,7 +1129,7 @@ foreach program_name, extra_args : test_extra_programs
program_name : executable(program_name,
sources: [source, extra_sources],
c_args : test_c_args,
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []) + [app_profile_dep],
install_dir : installed_tests_execdir,
install_tag : 'tests',
install : install,
@@ -1168,7 +1168,7 @@ foreach test_name, extra_args : gio_tests
exe = executable(test_name, [source, extra_sources],
c_args : test_c_args + extra_args.get('c_args', []),
cpp_args : test_cpp_args + extra_args.get('cpp_args', []),
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []) + [app_profile_dep],
install_rpath : extra_args.get('install_rpath', ''),
install_dir: installed_tests_execdir,
install_tag: 'tests',

5
gio/tests/static-link/meson.build
View File

@@ -3,6 +3,9 @@ project('test-static-link', 'c')
# This is a dummy project that static links against installed gio.
# See gio/tests/static-link.py.
app = executable('test-static-link', 'app.c',
dependencies : dependency('gio-2.0', static : true)
dependencies : [
dependency('gio-2.0', static : true),
app_profile_dep,
]
)
test('test-static-link', app)

1
girepository/compiler/meson.build
View File

@@ -20,6 +20,7 @@ gicompilerepository = executable('gi-compile-repository', 'compiler.c',
libgirepository_dep,
libgirepository_internals_dep,
libgio_dep,
app_profile_dep,
],
install: true,
c_args: custom_c_args,

1
girepository/decompiler/meson.build
View File

@@ -20,6 +20,7 @@ gidecompiletypelib = executable('gi-decompile-typelib', 'decompiler.c',
libgirepository_dep,
libgirepository_internals_dep,
libgio_dep,
app_profile_dep,
],
install: true,
c_args: custom_c_args,

1
girepository/inspector/meson.build
View File

@@ -19,6 +19,7 @@ giinspecttypelib = executable('gi-inspect-typelib', 'inspector.c',
dependencies: [
libgirepository_dep,
libgio_dep,
app_profile_dep,
],
install: true,
c_args: custom_c_args,

3
girepository/meson.build
View File

@@ -225,7 +225,8 @@ executable('gi-dump-types',
dependencies: [
libgirepository_dep,
libgiounix_dep,
libgiowin32_dep
libgiowin32_dep,
app_profile_dep,
],
)

2
girepository/tests/meson.build
View File

@@ -96,7 +96,7 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_deps = [libm, thread_dep, libgirepository_dep]
test_deps = [libm, thread_dep, libgirepository_dep, app_profile_dep]
test_cargs = ['-DG_LOG_DOMAIN="GIRepository"', '-UG_DISABLE_ASSERT', warning_sign_conversion_args]
test_cpp_args = test_cargs

2
glib/glib-mirroring-tab/meson.build
View File

@@ -1,5 +1,5 @@
gen_mirroring_tab = executable('gen-mirroring-tab',
['gen-mirroring-tab.c', 'packtab.c'],
dependencies : [libglib_dep],
dependencies : [libglib_dep, app_profile_dep],
install: false,
)

10
glib/meson.build
View File

@@ -496,23 +496,23 @@ if host_system == 'windows'
install : true,
win_subsystem : 'windows',
include_directories : configinc,
dependencies : [libglib_dep])
dependencies : [libglib_dep, app_profile_dep])
gspawn_helpers += executable('gspawn-win32-helper-console', 'gspawn-win32-helper.c',
install : true,
c_args : ['-DHELPER_CONSOLE'],
include_directories : configinc,
dependencies : [libglib_dep])
dependencies : [libglib_dep, app_profile_dep])
else
gspawn_helpers += executable('gspawn-win64-helper', 'gspawn-win32-helper.c',
install : true,
win_subsystem : 'windows',
include_directories : configinc,
dependencies : [libglib_dep])
dependencies : [libglib_dep, app_profile_dep])
gspawn_helpers += executable('gspawn-win64-helper-console', 'gspawn-win32-helper.c',
install : true,
c_args : ['-DHELPER_CONSOLE'],
include_directories : configinc,
dependencies : [libglib_dep])
dependencies : [libglib_dep, app_profile_dep])
endif
else
gtester = executable('gtester', 'gtester.c',
@@ -520,7 +520,7 @@ else
install_tag : 'bin-devel',
c_args : ['-UG_DISABLE_ASSERT'],
include_directories : configinc,
dependencies : [libglib_dep])
dependencies : [libglib_dep, app_profile_dep])
# Provide tools for others when we're a subproject and they use the Meson GNOME module
meson.override_find_program('gtester', gtester)

4
glib/tests/meson.build
View File

@@ -400,8 +400,8 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_deps = [libm, thread_dep, libglib_dep]
test_deps_static = [libm, thread_dep, libglib_static_dep]
test_deps = [libm, thread_dep, libglib_dep, app_profile_dep]
test_deps_static = [libm, thread_dep, libglib_static_dep, app_profile_dep]
test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']
test_cpp_args = test_cargs

2
gmodule/tests/meson.build
View File

@@ -74,7 +74,7 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_deps = [libm, thread_dep, libglib_dep, libgmodule_dep]
test_deps = [libm, thread_dep, libglib_dep, libgmodule_dep, app_profile_dep]
test_cargs = ['-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT', warning_sign_conversion_args]
test_cpp_args = test_cargs

2
gobject/meson.build
View File

@@ -171,7 +171,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep)
gobject_query = executable('gobject-query', 'gobject-query.c',
install : true,
install_tag : 'bin-devel',
dependencies : [libglib_dep, libgobject_dep])
dependencies : [libglib_dep, libgobject_dep, app_profile_dep])
install_data('gobject_gdb.py',
install_dir : glib_pkgdatadir / 'gdb',

2
gobject/tests/meson.build
View File

@@ -178,7 +178,7 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
test_deps = [libm, thread_dep, libglib_dep, libgobject_dep, app_profile_dep]
test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT', warning_sign_conversion_args]
test_cpp_args = test_cargs

2
gobject/tests/performance/meson.build
View File

@@ -11,7 +11,7 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
test_deps = [libm, thread_dep, libglib_dep, libgobject_dep, app_profile_dep]
test_cargs = ['-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT']
foreach test_name, extra_args : gobject_tests

2
gthread/tests/meson.build
View File

@@ -6,7 +6,7 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_deps = [thread_dep, libglib_dep, libgthread_dep]
test_deps = [thread_dep, libglib_dep, libgthread_dep, app_profile_dep]
test_cargs = ['-DG_LOG_DOMAIN="GLib-GThread"', '-UG_DISABLE_ASSERT', warning_sign_conversion_args]
test_cpp_args = test_cargs

1
meson.build
View File

@@ -2717,6 +2717,7 @@ pkg = import('pkgconfig')
windows = import('windows')
gnome = import('gnome')
subdir('build-aux')
subdir('tools')
subdir('glib')
subdir('gobject')