diff options
| author | Lionel Landwerlin <[email protected]> | 2019-05-10 18:55:54 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <[email protected]> | 2019-05-22 14:07:14 +0000 |
| commit | cb7c9b2a9352cc73a2d3becc0427c53c8baf153a (patch) | |
| tree | 28ae03b3d66c6a31edfbd1fdfcc2c1c0c3e1792b /src/vulkan | |
| parent | 506ebf55c0446e690c2f40471fce2d4ea2f9762d (diff) | |
vulkan: fix build dependency issue with generated files
On machines with many cores, you can run into that issue :
../mesa-9999/src/vulkan/overlay-layer/overlay.cpp:42:10: fatal error: vk_enum_to_str.h: No such file or directory
v2: Move declare_dependency around (Eric)
Signed-off-by: Lionel Landwerlin <[email protected]>
Reported-by: Jan Ziak
Cc: <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/meson.build | 1 | ||||
| -rw-r--r-- | src/vulkan/overlay-layer/meson.build | 6 | ||||
| -rw-r--r-- | src/vulkan/util/meson.build | 12 | ||||
| -rw-r--r-- | src/vulkan/wsi/meson.build | 4 |
4 files changed, 17 insertions, 6 deletions
diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build index 3d4f80e2e39..afd2911e83d 100644 --- a/src/vulkan/meson.build +++ b/src/vulkan/meson.build @@ -20,7 +20,6 @@ vk_api_xml = files('registry/vk.xml') -inc_vulkan_util = include_directories('util') inc_vulkan_wsi = include_directories('wsi') vulkan_wsi_args = [] diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index 3fd3a105b89..326e2004b53 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -41,10 +41,10 @@ vklayer_mesa_overlay = shared_library( vklayer_files, overlay_spv, c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args], cpp_args : [cpp_vis_args, vulkan_wsi_args], - dependencies : [vulkan_wsi_deps, libimgui_core_dep, dep_dl], - include_directories : [inc_common, inc_vulkan_util], + dependencies : [idep_vulkan_util, vulkan_wsi_deps, libimgui_core_dep, dep_dl], + include_directories : inc_common, link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']), - link_with : [libmesa_util, libvulkan_util], + link_with : libmesa_util, install : true ) diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build index db09482e3a7..84a44862495 100644 --- a/src/vulkan/util/meson.build +++ b/src/vulkan/util/meson.build @@ -44,3 +44,15 @@ libvulkan_util = static_library( c_args : [c_vis_args, vulkan_wsi_args], build_by_default : false, ) + +idep_vulkan_util_headers = declare_dependency( + sources : vk_enum_to_str[1], + include_directories : include_directories('.') +) + +idep_vulkan_util = declare_dependency( + sources : vk_enum_to_str[1], + link_with : libvulkan_util, + include_directories : include_directories('.'), + dependencies : idep_vulkan_util_headers +) diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index 1f8ada56962..01b5f39da4b 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -41,9 +41,9 @@ endif libvulkan_wsi = static_library( 'vulkan_wsi', files_vulkan_wsi, - include_directories : [inc_common, inc_vulkan_util, inc_include], + include_directories : [inc_common, inc_include], link_with: [libxmlconfig], - dependencies : [vulkan_wsi_deps, dep_libdrm], + dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util], c_args : [c_vis_args, vulkan_wsi_args], build_by_default : false, ) |