1
0
vulkan-validationlayers/xxhash.diff

38 lines
1.4 KiB
Diff

From: Jan Engelhardt <jengelh@inai.de>
Date: 2020-08-29 10:10:12.022296526 +0200
Avoid the installation of a custom xxhash.h header. Since vk_*.h header files
still include xxhash.h (and now would source the system xxhash instead of the
bundled one), it makes sense to build ValidationLayers itself with the system
xxhash as well, so that the ABI matches.
---
layers/CMakeLists.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt
@@ -50,10 +50,8 @@ target_sources(VkLayer_utils PRIVATE
vk_layer_logging.cpp
vk_layer_utils.h
vk_layer_utils.cpp
- xxhash.h
- xxhash.c
)
-target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
+target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers -lxxhash)
set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX)
target_include_directories(VkLayer_utils PUBLIC
.
@@ -258,8 +256,6 @@ target_sources(VkLayer_khronos_validatio
video_validation.cpp
vk_layer_settings_ext.h
wsi_validation.cpp
- xxhash.c
- xxhash.h
)
target_compile_definitions(VkLayer_khronos_validation PUBLIC ${KHRONOS_LAYER_COMPILE_DEFINITIONS})