diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-09-06 13:20:28 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-09-06 13:44:22 +0000 |
| commit | eebb2e837cbe6de185bdb6b32c0755b9d2fce4e1 (patch) | |
| tree | f883e3f6109f751887bce24b98c825a979cbf0e5 | |
| parent | e0b6521ef71a63a20890cc575738e53876fb1b3a (diff) | |
| download | ports-eebb2e837cbe6de185bdb6b32c0755b9d2fce4e1.tar.gz ports-eebb2e837cbe6de185bdb6b32c0755b9d2fce4e1.zip | |
graphics/vulkan-validation-layers: simplify bundled SPIRV-Headers workaround
| -rw-r--r-- | graphics/vulkan-validation-layers/Makefile | 3 | ||||
| -rw-r--r-- | graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile index 284d42f2b3af..2b076c628940 100644 --- a/graphics/vulkan-validation-layers/Makefile +++ b/graphics/vulkan-validation-layers/Makefile @@ -18,10 +18,9 @@ USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/layers/SPIRV-Headers CMAKE_OFF= BUILD_TESTS CMAKE_ON= BUILD_LAYER_SUPPORT_FILES -CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB diff --git a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt index c96d097f56a7..56dc12c99336 100644 --- a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt +++ b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt @@ -10,17 +10,16 @@ CMake Error at layers/CMakeLists.txt:114 (find_package): "SPIRV-Headers" provides a separate development package or SDK, be sure it has been installed. ---- layers/CMakeLists.txt.orig 2023-01-20 04:42:25 UTC +--- layers/CMakeLists.txt.orig 2023-08-29 03:23:36 UTC +++ layers/CMakeLists.txt -@@ -111,7 +111,12 @@ add_library(VVL-SPIRV-LIBS INTERFACE) +@@ -152,7 +152,10 @@ add_library(VVL-SPIRV-LIBS INTERFACE) # Represents all SPIRV libraries we need add_library(VVL-SPIRV-LIBS INTERFACE) -+if (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) -+else() - find_package(SPIRV-Headers REQUIRED CONFIG QUIET) +-find_package(SPIRV-Headers REQUIRED CONFIG QUIET) ++find_package(SPIRV-Headers CONFIG QUIET) ++if (NOT TARGET SPIRV-Headers::SPIRV-Headers) ++ add_subdirectory(SPIRV-Headers EXCLUDE_FROM_ALL SYSTEM) +endif() target_link_libraries(VVL-SPIRV-LIBS INTERFACE SPIRV-Headers::SPIRV-Headers) |