d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples: fix install with empty meson parameter

Browse Source 
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>
This commit is contained in:
Bruce Richardson 2019-05-17 13:02:29 +01:00 committed by Thomas Monjalon
parent c6a53a6bcd
commit 85d7158edf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/meson.build
View File

@ -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

7
meson.build
View File

@ -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')