From aa193c3be60ab7431777311ed5eecbb721332bef Mon Sep 17 00:00:00 2001 From: lbonn Date: Tue, 27 Feb 2024 20:42:50 +0100 Subject: [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) --- doc/meson.build | 4 ++-- meson.build | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 8a2f8c5c..e898a5b0 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -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', diff --git a/meson.build b/meson.build index 1018becd..a8863efc 100644 --- a/meson.build +++ b/meson.build @@ -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', @@ -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' ) @@ -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') @@ -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 ], ) -- cgit v1.2.3