Skip to content

Commit

Permalink
meson: bump minimal dependency version up to 0.60.0 for list.<plus>
Browse files Browse the repository at this point in the history
The expression was newly available at meson build 0.60.0 version.

Signed-off-by: Takashi Sakamoto <[email protected]>
  • Loading branch information
takaswie committed Oct 11, 2023
1 parent db82871 commit 0f7f250
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Dependencies
Requirements to build
=====================

- Meson 0.56.0 or later
- Meson 0.60.0 or later
- Ninja
- PyGObject (optional to run unit tests)
- gi-docgen (optional to generate API documentation)
Expand Down
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
project('libhinawa', 'c',
version: '2.6.1',
license: 'LGPL-2.1+',
meson_version: '>= 0.56.0',
meson_version: '>= 0.60.0',
)

# Detect support level in Linux sound subsystem.
cc = meson.get_compiler('c')

header_dirs = []
backport_header_dir = []
if not cc.has_header_symbol('include/linux/firewire-cdev.h', 'FW_CDEV_EVENT_REQUEST3')
# Use backport header from Linux kernel v5.16 prepatch.
header_dirs += include_directories('include')
backport_header_dir += include_directories('include')
endif

# For g-i and documentation.
Expand Down
4 changes: 1 addition & 3 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,12 @@ enums = gnome.mkenums_simple('hinawa_enums',
mapfile = 'hinawa.map'
vflag = '-Wl,--version-script,' + join_paths(meson.current_source_dir(), mapfile)

header_dirs += include_directories('.')

myself = library('hinawa',
sources: sources + headers + privates + marshallers + enums,
version: meson.project_version(),
soversion: meson.project_version().split('.')[0],
install: true,
include_directories: header_dirs,
include_directories: backport_header_dir + include_directories('.'),
dependencies: dependencies,
link_args : vflag,
link_depends : mapfile,
Expand Down

0 comments on commit 0f7f250

Please sign in to comment.