build: add workarounds for Windows helloworld

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index fa6bf3d..a964865 100644 (file)
--- 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'
@@ -23,7 +24,10 @@ 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', '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