From f961300232bad35e45769d4cb307c5d3765d27ab Mon Sep 17 00:00:00 2001 From: Wook Song Date: Thu, 7 Nov 2019 13:49:52 +0900 Subject: [PATCH] [Ext/Filter/Meson/MVNC] Use functions added after 0.44 and 0.47 As the minimum version required is changed to 0.50.0, this patch modifies the meson build scriptlet for the MVNC tensor_filter extension to use functions such as warning() and check_header() added after 0.44 and 0.47, respectively, as well. Signed-off-by: Wook Song --- ext/nnstreamer/tensor_filter/meson.build | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ext/nnstreamer/tensor_filter/meson.build b/ext/nnstreamer/tensor_filter/meson.build index c0d721e..88a5396 100644 --- a/ext/nnstreamer/tensor_filter/meson.build +++ b/ext/nnstreamer/tensor_filter/meson.build @@ -228,17 +228,11 @@ endif if get_option('enable-movidius-ncsdk2') # Explicitly checks mvnc.h in the ncsdk2 directory - # check_header() requires meson >= 0.47 - # if not cc.check_header('mvnc2/mvnc.h') - nns_mvncsdk2_dep = cc.find_library('mvnc') - if not cc.has_header('mvnc2/mvnc.h') - # warning() requires meson >= 0.44 - # warning('enable-movidius-ncsdk2 is set but could not find \'mvnc2/mvnc.h\'.') - message('enable-movidius-ncsdk2 is set but could not find \'mvnc2/mvnc.h\'.') - elif not nns_mvncsdk2_dep.found() - # warning() requires meson >= 0.44 - # warning('enable-movidius-ncsdk2 is set but could not find \'libmvnc.so\'.') - message('enable-movidius-ncsdk2 is set but could not find \'libmvnc.so\'.') + nns_mvncsdk2_dep = cc.find_library('mvnc', required: false) + if not nns_mvncsdk2_dep.found() + warning('Failed to find \'libmvnc.so\' despite setting enable-movidius-ncsdk2. This option be ignored.') + elif not cc.check_header('mvnc2/mvnc.h') + warning('Failed to find \'mvnc2/mvnc.h\' despite setting enable-movidius-ncsdk2. This option be ignored.') else filter_sub_mvncsdk2_sources = [ 'tensor_filter_movidius_ncsdk2.c' -- 2.7.4