diff options
| -rw-r--r-- | meson.build | 11 | ||||
| -rw-r--r-- | tests/meson.build | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 83e175cec..bea55858b 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('flashromutils', 'c', - version : run_command('util/getversion.sh', '--version').stdout().strip(), + version : run_command('util/getversion.sh', '--version', check : true).stdout().strip(), license : 'GPL-2.0', meson_version : '>=0.50.0', default_options : [ @@ -7,7 +7,8 @@ project('flashromutils', 'c', 'c_std=c99', 'werror=true', 'optimization=s', - 'debug=false'], + 'debug=false', + ], ) # libtool versioning @@ -465,7 +466,7 @@ pkgg.generate( ) conf.set('VERSION', version) -conf.set('MAN_DATE', run_command('util/getversion.sh', '--man-date').stdout().strip()) +conf.set('MAN_DATE', run_command('util/getversion.sh', '--man-date', check : true).stdout().strip()) configure_file( input : 'flashrom.8.tmpl', output : 'flashrom.8', @@ -493,8 +494,8 @@ subdir('util') # Use `.auto() or .enabled()` instead of `.allowed()` to keep the minimum meson version as low as possible. # `.allowed()` gets introduced in 0.59.0 if get_option('tests').auto() or get_option('tests').enabled() -# unit-test framework -cmocka_dep = dependency( + # unit-test framework + cmocka_dep = dependency( 'cmocka', fallback: ['cmocka', 'cmocka_dep'], required : get_option('tests') diff --git a/tests/meson.build b/tests/meson.build index 318d4aa74..f6f416f0f 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -11,8 +11,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -root_includes = include_directories('../subprojects') - srcs = [ 'io_mock.c', 'tests.c', @@ -105,7 +103,6 @@ mocks = [ flashrom_tests = executable('flashrom_unit_tests', srcs, - include_directories : root_includes, c_args : [ cargs, '-ffunction-sections', |