pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: bump Meson min version to 0.58

Browse Source 
The next commit will need that version. Adjust the build to not
trigger deprecation warnings.
This commit is contained in:
Simon Ser 2021-12-20 16:41:10 +01:00
parent 5150d3869c
commit 386f8f4241
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meson.build
View File

@ -3,7 +3,7 @@ project(
'c', 'c',
version: '1.6', version: '1.6',
license: 'MIT', license: 'MIT',
meson_version: '>=0.48.0', meson_version: '>=0.58.0',
default_options: [ default_options: [
'c_std=c11', 'c_std=c11',
'warning_level=2', 'warning_level=2',
@ -52,15 +52,15 @@ wayland_scanner = find_program('wayland-scanner')
version = '"@0@"'.format(meson.project_version()) version = '"@0@"'.format(meson.project_version())
if git.found() if git.found()
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']) git_commit_hash = run_command([git, 'describe', '--always', '--tags'])
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']) git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'])
if git_commit_hash.returncode() == 0 and git_branch.returncode() == 0 if git_commit_hash.returncode() == 0 and git_branch.returncode() == 0
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip()) version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip())
endif endif
endif endif
add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c') add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c')
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir') wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
if wayland_client.version().version_compare('>=1.14.91') if wayland_client.version().version_compare('>=1.14.91')
code_type = 'private-code' code_type = 'private-code'
@ -175,7 +175,7 @@ if scdoc.found()
input: filename, input: filename,
output: output, output: output,
command: [ command: [
sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.path(), output) sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.full_path(), output)
], ],
install: true, install: true,
install_dir: '@0@/man@1@'.format(mandir, section) install_dir: '@0@/man@1@'.format(mandir, section)
@ -199,7 +199,7 @@ if get_option('bash-completions')
'completions/bash/swaylock', 'completions/bash/swaylock',
) )
if bash_comp.found() if bash_comp.found()
bash_install_dir = bash_comp.get_pkgconfig_variable('completionsdir') bash_install_dir = bash_comp.get_variable('completionsdir')
else else
bash_install_dir = datadir + '/bash-completion/completions' bash_install_dir = datadir + '/bash-completion/completions'
endif endif
@ -212,7 +212,7 @@ if get_option('fish-completions')
'completions/fish/swaylock.fish', 'completions/fish/swaylock.fish',
) )
if fish_comp.found() if fish_comp.found()
fish_install_dir = fish_comp.get_pkgconfig_variable('completionsdir') fish_install_dir = fish_comp.get_variable('completionsdir')
else else
fish_install_dir = datadir + '/fish/vendor_completions.d' fish_install_dir = datadir + '/fish/vendor_completions.d'
endif endif