meson: remove unnecessary argument nesting

This commit is contained in:
Tristan Partin
2023-07-28 14:03:51 -05:00
parent 50cfd82286
commit f40587a38a
4 changed files with 12 additions and 13 deletions

View File

@ -1,4 +1,4 @@
project('sysprof', ['c', 'cpp'], project('sysprof', 'c', 'cpp',
license: 'GPL-3.0-or-later OR GPL-2.0-or-later', license: 'GPL-3.0-or-later OR GPL-2.0-or-later',
version: '45.alpha', version: '45.alpha',
meson_version: '>=0.62.0', meson_version: '>=0.62.0',
@ -135,7 +135,7 @@ has_clockid = cc.has_member('struct perf_event_attr',
config_h.set('HAVE_PERF_CLOCKID', has_use_clockid and has_clockid) config_h.set('HAVE_PERF_CLOCKID', has_use_clockid and has_clockid)
# For config.h # For config.h
add_project_arguments(['-I'+meson.current_build_dir()], language: 'c') add_project_arguments('-I' + meson.current_build_dir(), language: 'c')
global_c_args = [ global_c_args = [
'-DSYSPROF_COMPILATION', '-DSYSPROF_COMPILATION',

View File

@ -1,6 +1,6 @@
install_static = not meson.is_subproject() and get_option('install-static') install_static = not meson.is_subproject() and get_option('install-static')
libsysprof_capture_headers = files([ libsysprof_capture_headers = files(
'sysprof-address.h', 'sysprof-address.h',
'sysprof-clock.h', 'sysprof-clock.h',
'sysprof-capture-condition.h', 'sysprof-capture-condition.h',
@ -13,17 +13,17 @@ libsysprof_capture_headers = files([
'sysprof-platform.h', 'sysprof-platform.h',
'sysprof-capture.h', 'sysprof-capture.h',
'sysprof-version-macros.h', 'sysprof-version-macros.h',
]) )
if not meson.is_subproject() if not meson.is_subproject()
install_headers(libsysprof_capture_headers, subdir: sysprof_header_subdir) install_headers(libsysprof_capture_headers, subdir: sysprof_header_subdir)
endif endif
mapped_ring_buffer_sources = files([ mapped_ring_buffer_sources = files(
'mapped-ring-buffer.c', 'mapped-ring-buffer.c',
]) )
libsysprof_capture_sources = files([ libsysprof_capture_sources = files(
'sysprof-address.c', 'sysprof-address.c',
'sysprof-capture-condition.c', 'sysprof-capture-condition.c',
'sysprof-capture-cursor.c', 'sysprof-capture-cursor.c',
@ -34,7 +34,7 @@ libsysprof_capture_sources = files([
'sysprof-collector.c', 'sysprof-collector.c',
'sysprof-clock.c', 'sysprof-clock.c',
'sysprof-platform.c', 'sysprof-platform.c',
]) )
configure_file( configure_file(
input: 'sysprof-version.h.in', input: 'sysprof-version.h.in',

View File

@ -22,6 +22,6 @@ sysprof_agent = executable('sysprof-agent', sysprof_agent_sources,
install: true, install: true,
) )
install_data(['org.gnome.Sysprof.Agent.xml'], install_data('org.gnome.Sysprof.Agent.xml',
install_dir: join_paths(datadir, 'dbus-1/interfaces'), install_dir: join_paths(datadir, 'dbus-1/interfaces'),
) )

View File

@ -80,9 +80,8 @@ i18n.merge_file(
install_dir: join_paths(datadir, 'polkit-1/actions'), install_dir: join_paths(datadir, 'polkit-1/actions'),
) )
install_data([ install_data(
'org.gnome.Sysprof3.Profiler.xml', 'org.gnome.Sysprof3.Profiler.xml',
'org.gnome.Sysprof3.Service.xml', 'org.gnome.Sysprof3.Service.xml',
],
install_dir: join_paths(datadir, 'dbus-1/interfaces'), install_dir: join_paths(datadir, 'dbus-1/interfaces'),
) )