net: add MPLS header structure

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index 56a8c64..c9af335 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 project('DPDK', 'C',
-       version: '18.02.0',
+       version: '18.11.0-rc0',
        license: 'BSD',
        default_options: ['buildtype=release', 'default_library=static'],
        meson_version: '>= 0.41'
@@ -32,12 +32,21 @@ subdir('drivers')
 # build binaries and installable tools
 subdir('usertools')
 subdir('app')
+subdir('test')
+
+# build docs
+subdir('doc')
 
 # build any examples explicitly requested - useful for developers
 if get_option('examples') != ''
        subdir('examples')
 endif
 
+# build kernel modules if enabled
+if get_option('enable_kmods')
+       subdir('kernel')
+endif
+
 # write the build config
 build_cfg = 'rte_build_config.h'
 configure_file(output: build_cfg,
@@ -65,5 +74,41 @@ pkg.generate(name: meson.project_name(),
                        ['-Wl,-Bdynamic'] + dpdk_extra_ldflags,
        description: 'The Data Plane Development Kit (DPDK)',
        subdirs: [get_option('include_subdir_arch'), '.'],
-       extra_cflags: ['-include', 'rte_config.h', '-march=@0@'.format(machine)]
+       extra_cflags: ['-include', 'rte_config.h'] + machine_args
 )
+
+# final output, list all the libs and drivers to be built
+# this does not affect any part of the build, for information only.
+output_message = '\n=================\nLibraries Enabled\n=================\n'
+output_message += '\nlibs:\n\t'
+output_count = 0
+foreach lib:enabled_libs
+       output_message += lib + ', '
+       output_count += 1
+       if output_count == 8
+               output_message += '\n\t'
+               output_count = 0
+       endif
+endforeach
+message(output_message + '\n')
+
+
+# prior to 0.47 set_variable didn't work with arrays, so we can't
+# track driver lists easily
+if meson.version().version_compare('>=0.47')
+       output_message = '\n===============\nDrivers Enabled\n===============\n'
+       foreach class:driver_classes
+               class_drivers = get_variable(class + '_drivers')
+               output_message += '\n' + class + ':\n\t'
+               output_count = 0
+               foreach drv:class_drivers
+                       output_message += drv + ', '
+                       output_count += 1
+                       if output_count == 8
+                               output_message += '\n\t'
+                               output_count = 0
+                       endif
+               endforeach
+       endforeach
+       message(output_message + '\n')
+endif