1
0
vulkan-validationlayers/xxhash.diff

35 lines
1.4 KiB
Diff
Raw Normal View History

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 | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: Vulkan-ValidationLayers-sdk-1.3.243.0/layers/CMakeLists.txt
===================================================================
--- Vulkan-ValidationLayers-sdk-1.3.243.0.orig/layers/CMakeLists.txt
+++ Vulkan-ValidationLayers-sdk-1.3.243.0/layers/CMakeLists.txt
@@ -41,8 +41,6 @@ target_sources(VkLayer_utils PRIVATE
vk_layer_logging.cpp
vk_layer_utils.h
vk_layer_utils.cpp
- xxhash.h
- xxhash.cpp
)
# XXH_NO_LONG_LONG: removes compilation of algorithms relying on 64-bit types (XXH3 and XXH64). Only XXH32 will be compiled.
@@ -53,7 +51,7 @@ target_sources(VkLayer_utils PRIVATE
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640
target_compile_definitions(VkLayer_utils PUBLIC XXH_NO_LONG_LONG)
-target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers)
+target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers -lxxhash)
target_include_directories(VkLayer_utils PUBLIC
.
generated # Needed otherwise VkLayer_utils won't install properly.