X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=meson.build;h=a964865977f320a391cb168177c34e64992544d0;hb=13856b795362e11c1db20c1a134680653144bd1a;hp=0dd0e2d712f3a18288625c566d952456bb8fe1f9;hpb=c04172b5f0311ce7af586b6004b1f27993a5cc48;p=dpdk.git diff --git a/meson.build b/meson.build index 0dd0e2d712..a964865977 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation +# Copyright(c) 2017-2019 Intel Corporation project('DPDK', 'C', # Get version number from file. - # Use "more" rather than "cat" for windows compatibility. - version: run_command('more', files('VERSION')).stdout().strip(), + # Fallback to "more" for Windows compatibility. + version: run_command(find_program('cat', 'more'), + files('VERSION')).stdout().strip(), license: 'BSD', default_options: ['buildtype=release', 'default_library=static'], meson_version: '>= 0.47.1' @@ -20,22 +21,13 @@ dpdk_drivers = [] dpdk_extra_ldflags = [] dpdk_app_link_libraries = [] -# 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('') - pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('')) -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 # 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', 'lib/librte_eal/common/include') +global_inc = include_directories('.', 'config', + 'lib/librte_eal/common/include', + 'lib/librte_eal/@0@/eal/include'.format(host_machine.system()), +) subdir('config') # build libs and drivers