diff --git a/fuzzing/meson.build b/fuzzing/meson.build index addbe9071..a66c2dd21 100644 --- a/fuzzing/meson.build +++ b/fuzzing/meson.build @@ -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') diff --git a/gio/meson.build b/gio/meson.build index 201d2935f..774c8f906 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -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 diff --git a/gio/tests/meson.build b/gio/tests/meson.build index e719008e4..efd5e2ff7 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -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', diff --git a/gio/tests/static-link/meson.build b/gio/tests/static-link/meson.build index c0b638fe6..558840d0e 100644 --- a/gio/tests/static-link/meson.build +++ b/gio/tests/static-link/meson.build @@ -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) diff --git a/girepository/compiler/meson.build b/girepository/compiler/meson.build index eb704761e..c3fce078e 100644 --- a/girepository/compiler/meson.build +++ b/girepository/compiler/meson.build @@ -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, diff --git a/girepository/decompiler/meson.build b/girepository/decompiler/meson.build index b6090f61f..a2fb904b4 100644 --- a/girepository/decompiler/meson.build +++ b/girepository/decompiler/meson.build @@ -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, diff --git a/girepository/inspector/meson.build b/girepository/inspector/meson.build index 4467e6df8..81d43e3eb 100644 --- a/girepository/inspector/meson.build +++ b/girepository/inspector/meson.build @@ -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, diff --git a/girepository/meson.build b/girepository/meson.build index b08801891..3d1793e35 100644 --- a/girepository/meson.build +++ b/girepository/meson.build @@ -225,7 +225,8 @@ executable('gi-dump-types', dependencies: [ libgirepository_dep, libgiounix_dep, - libgiowin32_dep + libgiowin32_dep, + app_profile_dep, ], ) diff --git a/girepository/tests/meson.build b/girepository/tests/meson.build index b804346fb..4d3f64a6d 100644 --- a/girepository/tests/meson.build +++ b/girepository/tests/meson.build @@ -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 diff --git a/glib/glib-mirroring-tab/meson.build b/glib/glib-mirroring-tab/meson.build index 4b14ecf3b..2900be203 100644 --- a/glib/glib-mirroring-tab/meson.build +++ b/glib/glib-mirroring-tab/meson.build @@ -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, ) \ No newline at end of file diff --git a/glib/meson.build b/glib/meson.build index 209bcbfd1..19774c20c 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -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) diff --git a/glib/tests/meson.build b/glib/tests/meson.build index c4fec0c13..301c06c9d 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -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 diff --git a/gmodule/tests/meson.build b/gmodule/tests/meson.build index e7d7b3dd1..64e6040e0 100644 --- a/gmodule/tests/meson.build +++ b/gmodule/tests/meson.build @@ -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 diff --git a/gobject/meson.build b/gobject/meson.build index 91823af79..421d4e311 100644 --- a/gobject/meson.build +++ b/gobject/meson.build @@ -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', diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build index 214df4845..a3f4b17f8 100644 --- a/gobject/tests/meson.build +++ b/gobject/tests/meson.build @@ -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 diff --git a/gobject/tests/performance/meson.build b/gobject/tests/performance/meson.build index 0147f7c85..ae1a20943 100644 --- a/gobject/tests/performance/meson.build +++ b/gobject/tests/performance/meson.build @@ -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 diff --git a/gthread/tests/meson.build b/gthread/tests/meson.build index 66b50caf7..ebb67929c 100644 --- a/gthread/tests/meson.build +++ b/gthread/tests/meson.build @@ -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 diff --git a/meson.build b/meson.build index f30ca5806..f6b9f5135 100644 --- a/meson.build +++ b/meson.build @@ -2717,6 +2717,7 @@ pkg = import('pkgconfig') windows = import('windows') gnome = import('gnome') +subdir('build-aux') subdir('tools') subdir('glib') subdir('gobject')