Skip to content

Commit

Permalink
examples: fix flattening directory layout on install
Browse files Browse the repository at this point in the history
[ upstream commit e5b9500 ]

By installing the examples one-by-one in a loop in the examples
meson.build file we effectively flattened out the structure of the examples
folder and omitted some common and shared subfolders that were never
directly built.  Instead, we can remove the loop and just have the whole
"examples" folder installed as-is in a single statement, preserving its
directory structure, and thereby fixing the build of a number of the
examples.

Fixes: 2daf565 ("examples: install as part of ninja install")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
  • Loading branch information
bruce-richardson authored and bluca committed Nov 16, 2020
1 parent 936f642 commit 44b8800
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
7 changes: 0 additions & 7 deletions examples/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ all_examples = [
'vm_power_manager/guest_cli',
'vmdq', 'vmdq_dcb',
]
# install all example code on install - irrespective of whether the example in
# question is to be built as part of this build or not.
foreach ex:all_examples
install_subdir(ex,
install_dir: get_option('datadir') + '/dpdk/examples',
exclude_files: 'meson.build')
endforeach

if get_option('examples') == ''
subdir_done()
Expand Down
3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ subdir('doc')
# build any examples explicitly requested - useful for developers - and
# install any example code into the appropriate install path
subdir('examples')
install_subdir('examples',
install_dir: get_option('datadir') + '/dpdk',
exclude_files: 'meson.build')

# build kernel modules if enabled
if get_option('enable_kmods')
Expand Down

0 comments on commit 44b8800

Please sign in to comment.