Skip to content

Commit

Permalink
[Build] Bump minimal meson version to 0.59.0
Browse files Browse the repository at this point in the history
To remove some deprecated invocations.

0.47.0 (2018-07-02) -> 0.59.0 (2021-07-18)
  • Loading branch information
lbonn committed Feb 27, 2024
1 parent 43790b3 commit 1d0ce6d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions doc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ endif
doxy_conf = configuration_data()
doxy_conf.set('PACKAGE', meson.project_name())
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_top_srcdir', meson.source_root())
doxy_conf.set('abs_builddir', join_paths(meson.project_build_root(), meson.current_build_dir()))
doxy_conf.set('abs_top_srcdir', meson.project_source_root())

doxyfile = configure_file(
input: 'rofi.doxy.in',
Expand Down
10 changes: 5 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project('rofi', 'c',
version: '1.7.5-dev',
meson_version: '>=0.47.0',
meson_version: '>=0.59.0',
license: [ 'MIT' ],
default_options: [
'c_std=c99',
Expand All @@ -11,8 +11,8 @@ project('rofi', 'c',
c_compiler = meson.get_compiler('c')

add_project_arguments(
'-I@0@'.format(meson.build_root()),
'-I@0@'.format(join_paths(meson.source_root(), 'include')),
'-I@0@'.format(meson.project_build_root()),
'-I@0@'.format(join_paths(meson.project_source_root(), 'include')),
'-D_DEFAULT_SOURCE=1',
language: 'c'
)
Expand Down Expand Up @@ -130,7 +130,7 @@ config_h = configure_file(output: 'config.h', configuration: header_conf)

nk_options = [
'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_options = nk.get_variable('nk_options')
Expand Down Expand Up @@ -539,7 +539,7 @@ if cppcheck.found()
'--enable=all',
'-Uerror_dialog',
'--inconclusive',
'-I@0@'.format(join_paths(meson.source_root(), 'include')),
'-I@0@'.format(join_paths(meson.project_source_root(), 'include')),
rofi_sources
],
)
Expand Down

0 comments on commit 1d0ce6d

Please sign in to comment.