diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2022-10-28 03:54:50 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2022-10-28 11:31:19 +0000 |
| commit | 7e6bb8bb94ea3cc85e99e50a681bae8f5c135036 (patch) | |
| tree | 8ea70c9c47ce11ed6f5d3c1dc77bf3be6a02756f /graphics/vulkan-validation-layers/files/patch-CMakeLists.txt | |
| parent | www/pmwiki: Update to 2.3.13 (diff) | |
graphics/vulkan-validation-layers: update to 1.3.232
Changes: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/v1.3.231...v1.3.232
Reported by: Repology, portscout
Diffstat (limited to 'graphics/vulkan-validation-layers/files/patch-CMakeLists.txt')
| -rw-r--r-- | graphics/vulkan-validation-layers/files/patch-CMakeLists.txt | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt index 7b32eb01f8af..95461361098d 100644 --- a/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt +++ b/graphics/vulkan-validation-layers/files/patch-CMakeLists.txt @@ -1,3 +1,15 @@ +CMake Error at CMakeLists.txt:220 (find_package): + Could not find a package configuration file provided by "SPIRV-Headers" + with any of the following names: + + SPIRV-HeadersConfig.cmake + spirv-headers-config.cmake + + Add the installation prefix of "SPIRV-Headers" to CMAKE_PREFIX_PATH or set + "SPIRV-Headers_DIR" to a directory containing one of the above files. If + "SPIRV-Headers" provides a separate development package or SDK, be sure it + has been installed. + CMake Error at CMakeLists.txt:255 (find_package): Could not find a package configuration file provided by "robin_hood" with any of the following names: @@ -10,9 +22,9 @@ CMake Error at CMakeLists.txt:255 (find_package): "robin_hood" provides a separate development package or SDK, be sure it has been installed. ---- CMakeLists.txt.orig 2022-10-14 06:42:02 UTC +--- CMakeLists.txt.orig 2022-10-28 03:54:50 UTC +++ CMakeLists.txt -@@ -89,6 +89,8 @@ if (ROBIN_HOOD_HASHING_INSTALL_DIR) +@@ -89,12 +89,16 @@ if (ROBIN_HOOD_HASHING_INSTALL_DIR) # Dependencies can be installed in arbitrary locations. This is done by update_deps.py / users. if (ROBIN_HOOD_HASHING_INSTALL_DIR) list(APPEND CMAKE_PREFIX_PATH ${ROBIN_HOOD_HASHING_INSTALL_DIR}) @@ -21,7 +33,15 @@ CMake Error at CMakeLists.txt:255 (find_package): endif() if (GLSLANG_INSTALL_DIR) list(APPEND CMAKE_PREFIX_PATH ${GLSLANG_INSTALL_DIR}) -@@ -206,7 +208,9 @@ if (USE_ROBIN_HOOD_HASHING) + endif() + if (SPIRV_HEADERS_INSTALL_DIR) + list(APPEND CMAKE_PREFIX_PATH ${SPIRV_HEADERS_INSTALL_DIR}) ++ add_library(SPIRV-Headers::SPIRV-Headers INTERFACE IMPORTED) ++ target_include_directories(SPIRV-Headers::SPIRV-Headers INTERFACE ${SPIRV_HEADERS_INSTALL_DIR}/include) + endif() + if (SPIRV_TOOLS_INSTALL_DIR) + list(APPEND CMAKE_PREFIX_PATH ${SPIRV_TOOLS_INSTALL_DIR}) +@@ -209,11 +213,15 @@ if (USE_ROBIN_HOOD_HASHING) option(BUILD_LAYER_SUPPORT_FILES "Generate layer files" OFF) # For generating files when not building layers option(USE_ROBIN_HOOD_HASHING "Use robin-hood-hashing" ON) if (USE_ROBIN_HOOD_HASHING) @@ -31,3 +51,9 @@ CMake Error at CMakeLists.txt:255 (find_package): endif() if(BUILD_LAYERS OR BUILD_TESTS) ++ if (NOT TARGET SPIRV-Headers::SPIRV-Headers) + find_package(SPIRV-Headers REQUIRED CONFIG QUIET) ++ endif() + + include(VVLGenerateSourceCode) + |