X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=meson.build;h=15f71fb05ff88959bf5867d4096c7a43e776372e;hb=fd9e776e97550a9b31b75fdf67ffd0295a157025;hp=56a8c64d2aa87fbb663a9a98fc3e8ece9683ff70;hpb=6c9457c27954f16d99f3798711eb253fbaf05fa3;p=dpdk.git

diff --git a/meson.build b/meson.build
index 56a8c64d2a..15f71fb05f 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 project('DPDK', 'C',
-	version: '18.02.0',
+	version: '18.05-rc4',
 	license: 'BSD',
 	default_options: ['buildtype=release', 'default_library=static'],
 	meson_version: '>= 0.41'
@@ -32,12 +32,18 @@ subdir('drivers')
 # build binaries and installable tools
 subdir('usertools')
 subdir('app')
+subdir('test')
 
 # 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 +71,5 @@ 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
 )