From 0ea68a1efbfcc4961f2f816ab59e4ad8136c6250 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 5 Jul 2019 16:42:23 +0300 Subject: build: rename Meson options Meson emits a warning because we use options beginning with "build_": DEPRECATION: Option uses prefix "build_", which is reserved for Meson. This will become an error in the future. Rename our options so that we don't use the Meson-reserved prefix. Signed-off-by: Simon Ser Reviewed-by: Arkadiusz Hiler --- meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 0629d441..478869eb 100644 --- a/meson.build +++ b/meson.build @@ -77,10 +77,10 @@ foreach cc_arg : cc_args endif endforeach -build_chamelium = get_option('build_chamelium') -build_docs = get_option('build_docs') -build_tests = not get_option('build_tests').disabled() -with_libdrm = get_option('with_libdrm') +build_chamelium = get_option('chamelium') +build_docs = get_option('docs') +build_tests = not get_option('tests').disabled() +with_libdrm = get_option('libdrm_drivers') build_info = ['Build type: ' + get_option('buildtype')] @@ -118,13 +118,13 @@ pciaccess = dependency('pciaccess', version : '>=0.10') libkmod = dependency('libkmod') libprocps = dependency('libprocps', required : true) -libunwind = dependency('libunwind', required : get_option('with_libunwind')) +libunwind = dependency('libunwind', required : get_option('libunwind')) build_info += 'With libunwind: @0@'.format(libunwind.found()) libdw = dependency('libdw', required : true) pixman = dependency('pixman-1', required : true) -valgrind = dependency('valgrind', required : get_option('with_valgrind')) +valgrind = dependency('valgrind', required : get_option('valgrind')) if valgrind.found() config.set('HAVE_VALGRIND', 1) endif -- cgit v1.2.3