kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

graphics/vulkan-validation-layers: unbundle graphics/vulkan-utility-libraries

Browse source
This commit is contained in:
Jan Beich 2024-01-01 01:29:19 +01:00
parent 690f751b04
commit 1f567d1a58
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
graphics/vulkan-validation-layers/Makefile
View file

@ -11,14 +11,14 @@ LICENSE= APACHE20
BUILD_DEPENDS= robin-hood-hashing>0:devel/robin-hood-hashing \
spirv-tools>0:graphics/spirv-tools \
vulkan-headers>0:graphics/vulkan-headers
vulkan-headers>0:graphics/vulkan-headers \
vulkan-utility-libraries>0:graphics/vulkan-utility-libraries
USES= alias cmake compiler:c++11-lib pkgconfig python:build
USE_GITHUB= yes
GH_ACCOUNT= KhronosGroup
GH_PROJECT= Vulkan-ValidationLayers
GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/SPIRV-Headers \
KhronosGroup:Vulkan-Utility-Libraries:${DISTVERSIONPREFIX}${DISTVERSION}:utils/Vulkan-Utility-Libraries
GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/SPIRV-Headers
CMAKE_OFF= BUILD_TESTS
OPTIONS_DEFINE= WAYLAND XCB XLIB

20
graphics/vulkan-validation-layers/files/patch-CMakeLists.txt
View file

@ -1,14 +1,3 @@
CMake Error at layers/CMakeLists.txt:74 (target_link_libraries):
Target "VkLayer_utils" links to:
Vulkan::LayerSettings
but the target was not found. Possible reasons include:
* There is a typo in the target name.
* A find_package call is missing for an IMPORTED target.
* An ALIAS target is missing.
CMake Error at layers/CMakeLists.txt:318 (target_link_libraries):
Target "vvl" links to:
@ -20,15 +9,10 @@ CMake Error at layers/CMakeLists.txt:318 (target_link_libraries):
* A find_package call is missing for an IMPORTED target.
* An ALIAS target is missing.
--- CMakeLists.txt.orig 2023-10-07 00:41:35 UTC
--- CMakeLists.txt.orig 2023-12-20 00:20:05 UTC
+++ CMakeLists.txt
@@ -72,8 +72,14 @@ find_package(VulkanUtilityLibraries CONFIG QUIET)
find_package(VulkanHeaders CONFIG QUIET)
@@ -79,6 +79,9 @@ find_package(SPIRV-Headers CONFIG QUIET)
find_package(VulkanUtilityLibraries CONFIG QUIET)
+if (NOT TARGET Vulkan::UtilityHeaders OR NOT TARGET Vulkan::LayerSettings)
+ add_subdirectory(Vulkan-Utility-Libraries EXCLUDE_FROM_ALL SYSTEM)
+endif()
find_package(SPIRV-Headers CONFIG QUIET)
+if (NOT TARGET SPIRV-Headers::SPIRV-Headers)