1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00

[Build] Bump minimal meson version to 0.59.0 (#1947)

To remove some deprecated invocations.

0.47.0 (2018-07-02) -> 0.59.0 (2021-07-18)
This commit is contained in:
lbonn 2024-02-27 20:42:50 +01:00 committed by GitHub
parent 43790b3eda
commit aa193c3be6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions

View file

@ -25,8 +25,8 @@ endif
doxy_conf = configuration_data() doxy_conf = configuration_data()
doxy_conf.set('PACKAGE', meson.project_name()) doxy_conf.set('PACKAGE', meson.project_name())
doxy_conf.set('VERSION', meson.project_version()) doxy_conf.set('VERSION', meson.project_version())
doxy_conf.set('abs_builddir', join_paths(meson.build_root(), meson.current_build_dir())) doxy_conf.set('abs_builddir', join_paths(meson.project_build_root(), meson.current_build_dir()))
doxy_conf.set('abs_top_srcdir', meson.source_root()) doxy_conf.set('abs_top_srcdir', meson.project_source_root())
doxyfile = configure_file( doxyfile = configure_file(
input: 'rofi.doxy.in', input: 'rofi.doxy.in',

View file

@ -1,6 +1,6 @@
project('rofi', 'c', project('rofi', 'c',
version: '1.7.5-dev', version: '1.7.5-dev',
meson_version: '>=0.47.0', meson_version: '>=0.59.0',
license: [ 'MIT' ], license: [ 'MIT' ],
default_options: [ default_options: [
'c_std=c99', 'c_std=c99',
@ -11,8 +11,8 @@ project('rofi', 'c',
c_compiler = meson.get_compiler('c') c_compiler = meson.get_compiler('c')
add_project_arguments( add_project_arguments(
'-I@0@'.format(meson.build_root()), '-I@0@'.format(meson.project_build_root()),
'-I@0@'.format(join_paths(meson.source_root(), 'include')), '-I@0@'.format(join_paths(meson.project_source_root(), 'include')),
'-D_DEFAULT_SOURCE=1', '-D_DEFAULT_SOURCE=1',
language: 'c' language: 'c'
) )
@ -130,7 +130,7 @@ config_h = configure_file(output: 'config.h', configuration: header_conf)
nk_options = [ nk_options = [
'bindings=true', 'bindings=true',
'git-work-tree=@0@'.format(meson.source_root()), 'git-work-tree=@0@'.format(meson.project_source_root()),
] ]
nk = subproject('libnkutils', default_options: nk_options) nk = subproject('libnkutils', default_options: nk_options)
nk_subproject_options = nk.get_variable('nk_options') nk_subproject_options = nk.get_variable('nk_options')
@ -539,7 +539,7 @@ if cppcheck.found()
'--enable=all', '--enable=all',
'-Uerror_dialog', '-Uerror_dialog',
'--inconclusive', '--inconclusive',
'-I@0@'.format(join_paths(meson.source_root(), 'include')), '-I@0@'.format(join_paths(meson.project_source_root(), 'include')),
rofi_sources rofi_sources
], ],
) )