summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-05-17 13:02:29 +0100
committerThomas Monjalon <thomas@monjalon.net>2019-05-20 23:55:50 +0200
commit85d7158edf153853dd5aaec7a0b90b81e453e4b6 (patch)
tree33d12ec59bf1ec6f721b015649a121aa69673bf0
parentc6a53a6bcd0ae52afe0a6d58b059af577c9408b3 (diff)
downloaddpdk-85d7158edf153853dd5aaec7a0b90b81e453e4b6.zip
dpdk-85d7158edf153853dd5aaec7a0b90b81e453e4b6.tar.gz
dpdk-85d7158edf153853dd5aaec7a0b90b81e453e4b6.tar.xz
examples: fix install with empty meson parameter
While the examples were being installed into the appropriate install path when processing the examples/meson.build file, that file was only processed if the "examples" meson parameter was non-empty. Since we now do more than just build the examples, we need to unconditionally process the file. Fixes: 2daf565f91b5 ("examples: install as part of ninja install") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Luca Boccassi <bluca@debian.org>
-rw-r--r--examples/meson.build4
-rw-r--r--meson.build7
2 files changed, 7 insertions, 4 deletions
diff --git a/examples/meson.build b/examples/meson.build
index 1a6134f..1995f4d 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -19,6 +19,10 @@ foreach ex:all_examples
exclude_files: 'meson.build')
endforeach
+if get_option('examples') == ''
+ subdir_done()
+endif
+
if get_option('examples').to_lower() == 'all'
examples = all_examples
allow_skips = true # don't flag an error if we can't build an app
diff --git a/meson.build b/meson.build
index 46f9c56..9cad434 100644
--- a/meson.build
+++ b/meson.build
@@ -42,10 +42,9 @@ subdir('app')
# build docs
subdir('doc')
-# build any examples explicitly requested - useful for developers
-if get_option('examples') != ''
- subdir('examples')
-endif
+# build any examples explicitly requested - useful for developers - and
+# install any example code into the appropriate install path
+subdir('examples')
# build kernel modules if enabled
if get_option('enable_kmods')