Commit d8c80175 authored by Philip Withnall's avatar Philip Withnall

Merge branch 'pc-requires' into 'master'

build: Simplify pkg-config file generation

See merge request !2
parents deff0677 55960b9f
Pipeline #33489 passed with stages
in 4 minutes and 33 seconds
......@@ -7,7 +7,7 @@ libglib_testing_headers = [
'signal-logger.h',
]
libglib_testing_deps = [
libglib_testing_public_deps = [
dependency('gio-2.0', version: '>= 2.44'),
dependency('glib-2.0', version: '>= 2.44'),
dependency('gobject-2.0', version: '>= 2.44'),
......@@ -17,7 +17,7 @@ libglib_testing_include_subdir = join_paths(libglib_testing_api_name, 'libglib-t
libglib_testing = library(libglib_testing_api_name,
libglib_testing_sources + libglib_testing_headers,
dependencies: libglib_testing_deps,
dependencies: libglib_testing_public_deps,
include_directories: root_inc,
install: true,
version: meson.project_version(),
......@@ -40,9 +40,7 @@ pkgconfig.generate(
name: 'libglib-testing',
filebase: libglib_testing_api_name,
description: 'libglib-testing provides test harnesses and mock classes.',
# FIXME: This should be derived from libglib_testing_deps with Meson 0.45;
# see the `libraries` docs: http://mesonbuild.com/Pkgconfig-module.html#pkggenerate
requires: [ 'gio-2.0', 'glib-2.0', 'gobject-2.0' ],
requires: libglib_testing_public_deps,
)
subdir('docs')
......
project('libglib-testing','c',
version: '0.1.0',
meson_version: '>= 0.43.0',
meson_version: '>= 0.45.0',
license: 'LGPLv2.1+',
default_options: [
'c_std=gnu11',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment