varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Fix pkgconfig generation

Browse Source 
This fix error when gio is a subproject, when there is pc file
assotiated for objects in libraries_private meson automatically promote
them to requires.

Also remove some values that are already the default.
This commit is contained in:
Xavier Claessens
2020-10-01 09:52:09 -04:00
parent 93a21a25ab
commit f0303f4b68
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libsysprof-capture/meson.build
View File

@ -66,12 +66,9 @@ if not meson.is_subproject()
pkgconfig.generate(
libsysprof_capture,
subdirs: [ sysprof_header_subdir ],
version: meson.project_version(),
name: 'sysprof-capture-@0@'.format(libsysprof_api_version),
filebase: 'sysprof-capture-@0@'.format(libsysprof_api_version),
description: 'The static capture library for tools that generate profiling capture data',
install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
variables: [ 'datadir=' + datadir_for_pc_file ],
requires_private: libsysprof_capture_deps,
libraries_private: libsysprof_capture_deps,
)
endif

5
src/libsysprof-ui/meson.build
View File

@ -125,13 +125,10 @@ libsysprof_ui_dep = declare_dependency(
pkgconfig.generate(
libsysprof_ui,
subdirs: [ sysprof_header_subdir ],
version: meson.project_version(),
name: 'sysprof-ui-@0@'.format(libsysprof_api_version),
filebase: 'sysprof-ui-@0@'.format(libsysprof_api_version),
description: 'The UI library for GTK applications embedding sysprof',
install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
requires: [ 'gio-2.0', 'gtk+-3.0' ],
requires_private: libsysprof_ui_pkg_deps,
libraries_private: libsysprof_ui_pkg_deps,
variables: [
'datadir=' + datadir_for_pc_file,
],

6
src/libsysprof/meson.build
View File

@ -173,14 +173,10 @@ libsysprof_dep = declare_dependency(
pkgconfig.generate(
libsysprof,
subdirs: [ sysprof_header_subdir ],
version: meson.project_version(),
name: 'sysprof-@0@'.format(libsysprof_api_version),
filebase: 'sysprof-@0@'.format(libsysprof_api_version),
description: 'The library for console applications embedding sysprof',
install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
requires: [ 'gio-2.0' ],
requires_private: libsysprof_pkg_deps,
libraries_private: libsysprof_libs_private,
libraries_private: [libsysprof_libs_private, libsysprof_pkg_deps],
variables: [
'datadir=' + datadir_for_pc_file,
],