From cb3bf57467e89a6df25964ade62bcef05bf5cf27 Mon Sep 17 00:00:00 2001 From: AsbjornOlling Date: Thu, 5 Jun 2025 18:01:36 +0200 Subject: [PATCH] vulkan : fix build failure caused by vulkan-shaders-gen install --- ggml/src/ggml-vulkan/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ggml/src/ggml-vulkan/CMakeLists.txt b/ggml/src/ggml-vulkan/CMakeLists.txt index 662f137710716..b702de90307cb 100644 --- a/ggml/src/ggml-vulkan/CMakeLists.txt +++ b/ggml/src/ggml-vulkan/CMakeLists.txt @@ -51,12 +51,13 @@ if (Vulkan_FOUND) set(VULKAN_SHADER_GEN_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) set(VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS "") + set(VULKAN_SHADER_GEN_CMAKE_INSTALL_ARGS "") if (CMAKE_BUILD_TYPE AND CMAKE_BUILD_TYPE MATCHES "Debug|Release|MinSizeRel|RelWithDebInfo") list(APPEND VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS --config=${CMAKE_BUILD_TYPE}) + list(APPEND VULKAN_SHADER_GEN_CMAKE_INSTALL_ARGS --config=${CMAKE_BUILD_TYPE}) endif() # Test all shader extensions @@ -155,7 +156,7 @@ if (Vulkan_FOUND) SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders CMAKE_ARGS ${VULKAN_SHADER_GEN_CMAKE_ARGS} BUILD_COMMAND ${CMAKE_COMMAND} --build . ${VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS} - INSTALL_COMMAND ${CMAKE_COMMAND} --install . + INSTALL_COMMAND ${CMAKE_COMMAND} --install . ${VULKAN_SHADER_GEN_CMAKE_INSTALL_ARGS} INSTALL_DIR ${CMAKE_BINARY_DIR} ) ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)