Skip to content

vulkan : fix build failure caused by vulkan-shaders-gen install #14047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

vulkan : fix build failure caused by vulkan-shaders-gen install #14047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb3bf57
vulkan : fix build failure caused by vulkan-shaders-gen install
AsbjornOlling Jun 5, 2025
82bea12
Merge branch 'master' into fix-vulkan-build-failure-again
AsbjornOlling Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ggml/src/ggml-vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -151,7 +152,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)
Expand Down
Loading