build: move variable for drivers to top level

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index 7f5e867..e945a27 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('DPDK', 'C',
        version: '19.05.0-rc0',
        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.
@@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
 dpdk_static_libraries = []
+dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
 dpdk_app_link_libraries = []
@@ -32,7 +33,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 # 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
@@ -43,7 +44,6 @@ subdir('drivers')
 # build binaries and installable tools
 subdir('usertools')
 subdir('app')
-subdir('test')
 
 # build docs
 subdir('doc')
@@ -105,23 +105,18 @@ foreach lib:enabled_libs
 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
+output_message = '\n===============\nDrivers Enabled\n===============\n'
+foreach class:dpdk_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
-       message(output_message + '\n')
-endif
+endforeach
+message(output_message + '\n')