net/virtio: do not re-enter clean up routines

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index 7332e75..9f62697 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 project('DPDK', 'C',
-       version: '18.11-rc0',
+       version: '18.11.0-rc1',
        license: 'BSD',
        default_options: ['buildtype=release', 'default_library=static'],
        meson_version: '>= 0.41'
@@ -12,10 +12,21 @@ project('DPDK', 'C',
 cc = meson.get_compiler('c')
 dpdk_conf = configuration_data()
 dpdk_libraries = []
+dpdk_static_libraries = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
+dpdk_app_link_libraries = []
 
-driver_install_path = join_paths(get_option('libdir'), 'dpdk/drivers')
+# set the major version, which might be used by drivers and libraries
+# depending on the configuration options
+pver = meson.project_version().split('.')
+major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
+
+pmd_subdir_opt = get_option('drivers_install_subdir')
+if pmd_subdir_opt.contains('<VERSION>')
+       pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
+endif
+driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
 eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 
 # configure the build, and make sure configs here and in config folder are
@@ -34,6 +45,9 @@ subdir('usertools')
 subdir('app')
 subdir('test')
 
+# build docs
+subdir('doc')
+
 # build any examples explicitly requested - useful for developers
 if get_option('examples') != ''
        subdir('examples')
@@ -89,18 +103,23 @@ foreach lib:enabled_libs
 endforeach
 message(output_message + '\n')
 
-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
+
+# 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
-endforeach
-message(output_message + '\n')
+       message(output_message + '\n')
+endif