From: Jaeyun Date: Thu, 9 May 2019 02:26:26 +0000 (+0900) Subject: [Build/Meson] remove unnecessary flag X-Git-Tag: v0.2.0~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34dd9759ef079b175a3648bcb8f3c4e21214b8cc;p=platform%2Fupstream%2Fnnstreamer.git [Build/Meson] remove unnecessary flag Meson v0.50 supports the install arg in configure_file(). If install_dir is set, configured file will be installed. Also, TEST_TENSORFLOW in rpm spec is unnecessary. Signed-off-by: Jaeyun Jung --- diff --git a/meson.build b/meson.build index 973c294..a53f431 100644 --- a/meson.build +++ b/meson.build @@ -139,14 +139,12 @@ endif # Install .ini configure_file(input: 'nnstreamer.ini.in', output: 'nnstreamer.ini', - install: true, install_dir: nnstreamer_inidir, configuration: nnstreamer_conf ) # Install .pc configure_file(input: 'nnstreamer.pc.in', output: 'nnstreamer.pc', - install: true, install_dir: join_paths(nnstreamer_libdir, 'pkgconfig'), configuration: nnstreamer_conf ) diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec index 40a85f3..1eeb6c4 100644 --- a/packaging/nnstreamer.spec +++ b/packaging/nnstreamer.spec @@ -179,7 +179,6 @@ ninja -C build %{?_smp_mflags} export NNSTREAMER_FILTERS=$(pwd)/ext/nnstreamer/tensor_filter export NNSTREAMER_DECODERS=$(pwd)/ext/nnstreamer/tensor_decoder %ifarch x86_64 aarch64 - export TEST_TENSORFLOW=1 export NNSTREAMER_TF_MEM_OPTMZ=0 %endif ./tests/unittest_common diff --git a/tizen-api/meson.build b/tizen-api/meson.build index 7cbc6e4..4015e55 100644 --- a/tizen-api/meson.build +++ b/tizen-api/meson.build @@ -64,7 +64,6 @@ tizen_capi_dep = declare_dependency(link_with: tizen_capi_lib, ) configure_file(input: 'capi-nnstreamer.pc.in', output: 'capi-nnstreamer.pc', - install: true, install_dir: join_paths(nnstreamer_libdir, 'pkgconfig'), configuration: nnstreamer_conf )