[Meson] Place main library dep at the first place of deps

1. Guarantee the main library's position of deps.
2. Print out tf/tf-lite version number during meson.

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

diff --git a/ext/nnstreamer/tensor_filter/meson.build b/ext/nnstreamer/tensor_filter/meson.build
index 1b389f4..80faf52 100644 (file)
--- a/ext/nnstreamer/tensor_filter/meson.build
+++ b/ext/nnstreamer/tensor_filter/meson.build
@@ -74,6 +74,7 @@ if tf_support_is_available
       '-DTF_VERSION_MICRO=' + tf_ver_micro,
     ],
   )
+  message('TensorFlow version: ' + tf_ver)
 
   filter_sub_tf_sources = ['tensor_filter_tensorflow.cc']
 
@@ -115,6 +116,7 @@ if tflite_support_is_available
       '-DTFLITE_VERSION_MICRO=' + tflite_ver_micro,
     ],
   )
+  message('TensorFlow-lite version: ' + tflite_ver)
 
   if not flatbuf_support_is_available
     flatbuf_dep = dependency('flatbuffers', required : true, \
@@ -187,6 +189,7 @@ if tflite2_support_is_available
       '-DTFLITE_VERSION_MICRO=' + tflite2_ver_micro,
     ],
   )
+  message('TensorFlow2-lite version: ' + tflite2_ver)
 
   filter_sub_tflite2_sources = ['tensor_filter_tensorflow_lite.cc']
 

diff --git a/meson.build b/meson.build
index f2d25d6..147f38b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -316,11 +316,13 @@ foreach feature_name, data : features
 
   target = data.get('target', '')
 
-  _deps = data.get('extra_deps', [])
+  _deps = []
 
   if target != ''
     _deps += dependency(target, required: get_option(feature_name))
   endif
+  _deps += data.get('extra_deps', [])
+
 
   foreach dep : _deps
     if not dep.found()