Skip to content

Commit cb3bf57

Browse files
committed
vulkan : fix build failure caused by vulkan-shaders-gen install
1 parent 259469c commit cb3bf57

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ggml/src/ggml-vulkan/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ if (Vulkan_FOUND)
5151

5252
set(VULKAN_SHADER_GEN_CMAKE_ARGS
5353
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
54-
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
5554
)
5655

5756
set(VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS "")
57+
set(VULKAN_SHADER_GEN_CMAKE_INSTALL_ARGS "")
5858
if (CMAKE_BUILD_TYPE AND CMAKE_BUILD_TYPE MATCHES "Debug|Release|MinSizeRel|RelWithDebInfo")
5959
list(APPEND VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS --config=${CMAKE_BUILD_TYPE})
60+
list(APPEND VULKAN_SHADER_GEN_CMAKE_INSTALL_ARGS --config=${CMAKE_BUILD_TYPE})
6061
endif()
6162

6263
# Test all shader extensions
@@ -155,7 +156,7 @@ if (Vulkan_FOUND)
155156
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders
156157
CMAKE_ARGS ${VULKAN_SHADER_GEN_CMAKE_ARGS}
157158
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS}
158-
INSTALL_COMMAND ${CMAKE_COMMAND} --install .
159+
INSTALL_COMMAND ${CMAKE_COMMAND} --install . ${VULKAN_SHADER_GEN_CMAKE_INSTALL_ARGS}
159160
INSTALL_DIR ${CMAKE_BINARY_DIR}
160161
)
161162
ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)

0 commit comments

Comments
 (0)