power: fix frequency list buffer validation

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index 7332e75..fa6bf3d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2,26 +2,28 @@
 # Copyright(c) 2017 Intel Corporation
 
 project('DPDK', 'C',
-       version: '18.11-rc0',
+       # Get version number from file.
+       # Use "more" rather than "cat" for windows compatibility.
+       version: run_command('more', files('VERSION')).stdout().strip(),
        license: 'BSD',
        default_options: ['buildtype=release', 'default_library=static'],
-       meson_version: '>= 0.41'
+       meson_version: '>= 0.47.1'
 )
 
 # set up some global vars for compiler, platform, configuration, etc.
 cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
+dpdk_static_libraries = []
+dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
-
-driver_install_path = join_paths(get_option('libdir'), 'dpdk/drivers')
-eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
+dpdk_app_link_libraries = []
 
 # configure the build, and make sure configs here and in config folder are
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
-global_inc = include_directories('.', 'config')
+global_inc = include_directories('.', 'config', 'lib/librte_eal/common/include')
 subdir('config')
 
 # build libs and drivers
@@ -32,7 +34,9 @@ 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') != ''
@@ -67,9 +71,11 @@ pkg.generate(name: meson.project_name(),
        filebase: 'lib' + meson.project_name().to_lower(),
        version: meson.project_version(),
        libraries: dpdk_libraries,
-       libraries_private: dpdk_drivers + dpdk_libraries +
+       libraries_private: dpdk_drivers + dpdk_static_libraries +
                        ['-Wl,-Bdynamic'] + dpdk_extra_ldflags,
-       description: 'The Data Plane Development Kit (DPDK)',
+       description: '''The Data Plane Development Kit (DPDK).
+Note that CFLAGS might contain an -march flag higher than typical baseline.
+This is required for a number of static inline functions in the public headers.''',
        subdirs: [get_option('include_subdir_arch'), '.'],
        extra_cflags: ['-include', 'rte_config.h'] + machine_args
 )
@@ -90,7 +96,7 @@ endforeach
 message(output_message + '\n')
 
 output_message = '\n===============\nDrivers Enabled\n===============\n'
-foreach class:driver_classes
+foreach class:dpdk_driver_classes
        class_drivers = get_variable(class + '_drivers')
        output_message += '\n' + class + ':\n\t'
        output_count = 0