[Meson] change option name

change option to avoid duplicated feature name

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/meson.build b/meson.build
index 7076772..fae2ea6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -71,7 +71,7 @@ endif
 # Tensorflow
 have_tensorflow = false
 
-if get_option('ENABLE_TENSORFLOW')
+if get_option('enable-tensorflow')
   tf_dep = dependency('tensorflow', required: true)
   protobuf_dep = dependency('protobuf', version: '>= 3.4.0', required: true)
 
@@ -86,7 +86,7 @@ endif
 # Tensorflow-lite
 have_tensorflow_lite = false
 
-if get_option('ENABLE_TENSORFLOW_LITE')
+if get_option('enable-tensorflow-lite')
   tflite_dep = dependency('tensorflow-lite', required: true)
 
   if tflite_dep.found()
@@ -104,7 +104,7 @@ subdir('gst')
 subdir('nnstreamer_example')
 
 # Build unittests
-if get_option('ENABLE_TEST')
+if get_option('enable-test')
   subdir('tests')
 endif
 

diff --git a/meson_options.txt b/meson_options.txt
index 0e22c17..3bb31f7 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('ENABLE_TEST', type: 'boolean', value: true)
-option('ENABLE_TENSORFLOW_LITE', type: 'boolean', value: true)
-option('ENABLE_TENSORFLOW', type: 'boolean', value: true)
-option('INSTALL_EXAMPLES', type: 'boolean', value: false)
+option('enable-test', type: 'boolean', value: true)
+option('enable-tensorflow-lite', type: 'boolean', value: true)
+option('enable-tensorflow', type: 'boolean', value: true)
+option('install-example', type: 'boolean', value: false)

diff --git a/nnstreamer_example/custom_example_LSTM/meson.build b/nnstreamer_example/custom_example_LSTM/meson.build
index c7fd9e5..a9165dc 100644 (file)
--- a/nnstreamer_example/custom_example_LSTM/meson.build
+++ b/nnstreamer_example/custom_example_LSTM/meson.build
@@ -2,6 +2,6 @@ dummyLSTM = shared_library('dummyLSTM',
   'dummy_LSTM.c',
   dependencies: [libm_dep],
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )

diff --git a/nnstreamer_example/custom_example_RNN/meson.build b/nnstreamer_example/custom_example_RNN/meson.build
index cba0730..4fefd28 100644 (file)
--- a/nnstreamer_example/custom_example_RNN/meson.build
+++ b/nnstreamer_example/custom_example_RNN/meson.build
@@ -1,6 +1,6 @@
 dummyRNN = shared_library('dummyRNN',
   'dummy_RNN.c',
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )

diff --git a/nnstreamer_example/custom_example_average/meson.build b/nnstreamer_example/custom_example_average/meson.build
index d744345..46cba3a 100644 (file)
--- a/nnstreamer_example/custom_example_average/meson.build
+++ b/nnstreamer_example/custom_example_average/meson.build
@@ -1,6 +1,6 @@
 nnstreamer_customfilter_average = shared_library('nnstreamer_customfilter_average',
   'nnstreamer_customfilter_example_average.c',
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )

diff --git a/nnstreamer_example/custom_example_opencv/meson.build b/nnstreamer_example/custom_example_opencv/meson.build
index 3f97782..49ff2ba 100644 (file)
--- a/nnstreamer_example/custom_example_opencv/meson.build
+++ b/nnstreamer_example/custom_example_opencv/meson.build
@@ -4,7 +4,7 @@ nnstreamer_customfilter_opencv_scaler = shared_library('nnstreamer_customfilter_
   'nnstreamer_customfilter_opencv_scaler.cc',
   dependencies: [glib_dep, opencv_dep],
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )
 
@@ -12,6 +12,6 @@ nnstreamer_customfilter_opencv_average = shared_library('nnstreamer_customfilter
   'nnstreamer_customfilter_opencv_average.cc',
   dependencies: [glib_dep, opencv_dep],
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )

diff --git a/nnstreamer_example/custom_example_passthrough/meson.build b/nnstreamer_example/custom_example_passthrough/meson.build
index 96978cc..4b326c8 100644 (file)
--- a/nnstreamer_example/custom_example_passthrough/meson.build
+++ b/nnstreamer_example/custom_example_passthrough/meson.build
@@ -1,13 +1,13 @@
 nnstreamer_customfilter_passthrough = shared_library('nnstreamer_customfilter_passthrough',
   'nnstreamer_customfilter_example_passthrough.c',
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )
 
 nnstreamer_customfilter_passthrough_variable = shared_library('nnstreamer_customfilter_passthrough_variable',
   'nnstreamer_customfilter_example_passthrough_variable.c',
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )

diff --git a/nnstreamer_example/custom_example_scaler/meson.build b/nnstreamer_example/custom_example_scaler/meson.build
index 17be4a1..a4e1076 100644 (file)
--- a/nnstreamer_example/custom_example_scaler/meson.build
+++ b/nnstreamer_example/custom_example_scaler/meson.build
@@ -2,7 +2,7 @@ nnstreamer_customfilter_scaler = shared_library('nnstreamer_customfilter_scaler'
   'nnstreamer_customfilter_example_scaler.c',
   dependencies: [glib_dep],
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )
 
@@ -10,6 +10,6 @@ nnstreamer_customfilter_scaler_allocator = shared_library('nnstreamer_customfilt
   'nnstreamer_customfilter_example_scaler_allocator.c',
   dependencies: [glib_dep],
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: subplugins_install_dir
 )

diff --git a/nnstreamer_example/example_cam/meson.build b/nnstreamer_example/example_cam/meson.build
index ce3a44a..a4940a4 100644 (file)
--- a/nnstreamer_example/example_cam/meson.build
+++ b/nnstreamer_example/example_cam/meson.build
@@ -1,6 +1,6 @@
 nnstreamer_example_cam = executable('nnstreamer_example_cam',
   'nnstreamer_example_cam.c',
   dependencies: [glib_dep, gst_dep],
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )

diff --git a/nnstreamer_example/example_decoder_image_labelling/meson.build b/nnstreamer_example/example_decoder_image_labelling/meson.build
index a85fef3..b93deb5 100644 (file)
--- a/nnstreamer_example/example_decoder_image_labelling/meson.build
+++ b/nnstreamer_example/example_decoder_image_labelling/meson.build
@@ -1,6 +1,6 @@
 nnstreamer_example_decoder_image_labelling = executable('nnstreamer_example_decoder_image_labelling',
   'nnstreamer_example_decoder_image_labelling.c',
   dependencies: [glib_dep, gst_dep],
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )

diff --git a/nnstreamer_example/example_filter/meson.build b/nnstreamer_example/example_filter/meson.build
index 8a2cd61..bdaddcf 100644 (file)
--- a/nnstreamer_example/example_filter/meson.build
+++ b/nnstreamer_example/example_filter/meson.build
@@ -1,6 +1,6 @@
 nnstreamer_example_filter = executable('nnstreamer_example_filter',
   'nnstreamer_example_filter.c',
   dependencies: [glib_dep, gst_dep],
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )

diff --git a/nnstreamer_example/example_filter_performance_profile/meson.build b/nnstreamer_example/example_filter_performance_profile/meson.build
index 69b8ac5..95173ff 100644 (file)
--- a/nnstreamer_example/example_filter_performance_profile/meson.build
+++ b/nnstreamer_example/example_filter_performance_profile/meson.build
@@ -1,6 +1,6 @@
 nnstreamer_example_filter_performance_profile = executable('nnstreamer_example_filter_performance_profile',
   'nnstreamer_example_filter_performance_profile.c',
   dependencies: [glib_dep, gst_dep],
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )

diff --git a/nnstreamer_example/example_object_detection/meson.build b/nnstreamer_example/example_object_detection/meson.build
index cc1f6d9..eb31949 100644 (file)
--- a/nnstreamer_example/example_object_detection/meson.build
+++ b/nnstreamer_example/example_object_detection/meson.build
@@ -3,11 +3,11 @@ cairo_dep = dependency('cairo')
 nnstreamer_example_object_detection = executable('nnstreamer_example_object_detection',
   'nnstreamer_example_object_detection.cc',
   dependencies: [glib_dep, gst_dep, gst_video_dep, cairo_dep, libm_dep],
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )
 
-if get_option('INSTALL_EXAMPLES')
+if get_option('install-example')
   install_data(['get_model.sh', 'gst-launch-object-detection.sh'],
     install_dir: examples_install_dir
   )

diff --git a/nnstreamer_example/example_object_detection_tensorflow/meson.build b/nnstreamer_example/example_object_detection_tensorflow/meson.build
index 1730679..12195ba 100644 (file)
--- a/nnstreamer_example/example_object_detection_tensorflow/meson.build
+++ b/nnstreamer_example/example_object_detection_tensorflow/meson.build
@@ -4,11 +4,11 @@ nnstreamer_example_object_detection_tensorflow = executable('nnstreamer_example_
   'nnstreamer_example_object_detection_tensorflow.cc',
   dependencies: [glib_dep, gst_dep, gst_video_dep, cairo_dep, libm_dep],
   include_directories: nnstreamer_inc,
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )
 
-if get_option('INSTALL_EXAMPLES')
+if get_option('install-example')
   install_data(['get_model.sh'],
     install_dir: examples_install_dir
   )

diff --git a/nnstreamer_example/example_sink/meson.build b/nnstreamer_example/example_sink/meson.build
index fe24d04..092bd67 100644 (file)
--- a/nnstreamer_example/example_sink/meson.build
+++ b/nnstreamer_example/example_sink/meson.build
@@ -1,13 +1,13 @@
 nnstreamer_sink_example = executable('nnstreamer_sink_example',
   'nnstreamer_sink_example.c',
   dependencies: [glib_dep, gst_dep, gst_app_dep],
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )
 
 nnstreamer_sink_example_play = executable('nnstreamer_sink_example_play',
   'nnstreamer_sink_example_play.c',
   dependencies: [glib_dep, gst_dep, gst_app_dep],
-  install: get_option('INSTALL_EXAMPLES'),
+  install: get_option('install-example'),
   install_dir: examples_install_dir
 )

diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index b2eca4d..ba3e2c5 100644 (file)
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -98,9 +98,9 @@ CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
 mkdir -p build
 
 %ifarch x86_64 aarch64
-    meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -DINSTALL_EXAMPLES=true build
+    meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true build
 %else
-    meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -DINSTALL_EXAMPLES=true -DENABLE_TENSORFLOW=false build
+    meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true -Denable-tensorflow=false build
 %endif
 
 ninja -C build %{?_smp_mflags}