Remove dangerous dummy meson dep

When a dependency library is installed with hardcoded scripts,
declare dependency with as much information as possible from
the installed package to detect dependency errors at build-time.

Don't add a dummy dependency for actual library dependencies.

Fixes #2673

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/api/capi/meson.build b/api/capi/meson.build
index eaf224a19778dab96ddfe36bf40c024d29d7331b..34298314191cc39ef53ea5bae8f659e0a54c5078 100644 (file)
--- a/api/capi/meson.build
+++ b/api/capi/meson.build
@@ -43,7 +43,7 @@ if get_option('platform') == 'tizen'
 endif
 
 if get_option('platform') == 'android'
-  nntrainer_capi_dep = found_dummy_dep
+  nntrainer_capi_dep = declare_dependency(include_directories: capi_inc)
 else
   shared_library('capi-nntrainer',
     capi_src,

diff --git a/api/ccapi/meson.build b/api/ccapi/meson.build
index 36c0dcb8f117620d78eeb5181b2f694a323b19a1..11bbd858dc866e7a797e4eccfd74bf068ec82abd 100644 (file)
--- a/api/ccapi/meson.build
+++ b/api/ccapi/meson.build
@@ -24,7 +24,7 @@ ccapi_deps = [
 ]
 
 if get_option('platform') == 'android'
-  nntrainer_ccapi_dep = found_dummy_dep
+  nntrainer_ccapi_dep = declare_dependency(include_directories: ccapi_inc)
 else
   shared_library('ccapi-nntrainer',
     ccapi_src,

diff --git a/meson.build b/meson.build
index 2c2e6add3d7bad6991e623cd6a271f22d3f79e77..6fa5cd64da557ff2add93faf8ebcd7de3af03307 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -201,7 +201,6 @@ nntrainer_conf.set('MEMORY_SWAP', nntrainer_enable_swap)
 nntrainer_conf.set('MEMORY_SWAP_PATH', nntrainer_swapdir)
 
 dummy_dep = dependency('', required: false)
-found_dummy_dep = declare_dependency() # dummy dep to use if found
 ml_api_common_flag = '-DML_API_COMMON=0'
 
 # if ml-api-support is disabled, enable dummy common api interfaces and disable related dependencies.
@@ -242,8 +241,8 @@ if get_option('enable-blas')
   if get_option('platform') == 'android'
     message('preparing blas')
     run_command(meson.source_root() / 'jni' / 'prepare_openblas.sh', meson.build_root(), check: true)
-    blas_dep = found_dummy_dep
     blas_root = meson.build_root() / 'openblas'
+    blas_dep = declare_dependency(include_directories: [ 'openblas/include' ])
   else
     blas_dep = dependency('openblas')
   endif
@@ -314,7 +313,7 @@ if get_option('platform') == 'android'
   message('preparing iniparser')
   run_command(meson.source_root() / 'jni' / 'prepare_iniparser.sh', meson.build_root(), check: true)
   iniparser_root = meson.build_root() / 'iniparser'
-  iniparser_dep = found_dummy_dep
+  iniparser_dep = declare_dependency(include_directories: [ 'iniparser/src' ])
 endif
 
 if not iniparser_dep.found()
@@ -354,7 +353,7 @@ if get_option('platform') == 'android'
   meson.add_install_script(
     'sh', '-c', 'cp @0@ ${DESTDIR}@1@'.format(ml_api_inc / 'tizen_error.h', nntrainer_includedir)
   )
-  ml_api_common_dep = found_dummy_dep
+  ml_api_common_dep = declare_dependency(include_directories: ['ml-api-inference/include'])
 endif
 
 if get_option('enable-nnstreamer-backbone') and get_option('platform') != 'android'
@@ -370,7 +369,7 @@ else
     message('preparing tflite, because either tflite backbone or interpreter is enabled')
     run_command(meson.source_root() / 'jni' / 'prepare_tflite.sh', '2.3.0', meson.build_root(), check: true)
     tflite_root = meson.build_root() / 'tensorflow-2.3.0' / 'tensorflow-lite'
-    tflite_dep = found_dummy_dep
+    tflite_dep = declare_dependency(include_directories: [ 'tensorflow-2.3.0/tensorflow-lite/include' ])
   endif
 endif
 

diff --git a/nntrainer/meson.build b/nntrainer/meson.build
index 5c7a14d4a5295826d54ba402e4f07aa680ef67d1..2fa705a7564e6019c51aeb7f8993364cb4b22b96 100644 (file)
--- a/nntrainer/meson.build
+++ b/nntrainer/meson.build
@@ -72,7 +72,7 @@ foreach s : nntrainer_common_sources
 endforeach
 
 if get_option('platform') == 'android'
-  nntrainer_dep = found_dummy_dep
+  nntrainer_dep = declare_dependency(include_directories: nntrainer_inc)
 else
   # Build libraries
   nntrainer_shared = shared_library('nntrainer',