8000 cmake: use the current build config for vulkan-shaders-gen (#13595) · robbiemu/llama.cpp@e3a7cf6 · GitHub
[go: up one dir, main page]

Skip to content

Commit e3a7cf6

Browse files
authored
cmake: use the current build config for vulkan-shaders-gen (ggml-org#13595)
* fix: use the current build config for `vulkan-shaders-gen` * fix: only pass a valid build type to `--config`
1 parent 518329b commit e3a7cf6

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ggml/src/ggml-vulkan/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ if (Vulkan_FOUND)
5454
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
5555
)
5656

57+
set(VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS "")
58+
if (CMAKE_BUILD_TYPE AND CMAKE_BUILD_TYPE MATCHES "Debug|Release|MinSizeRel|RelWithDebInfo")
59+
list(APPEND VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS --config=${CMAKE_BUILD_TYPE})
60+
endif()
61+
5762
# Test all shader extensions
5863
test_shader_extension_support(
5964
"GL_KHR_cooperative_matrix"
@@ -149,7 +154,7 @@ if (Vulkan_FOUND)
149154
vulkan-shaders-gen
150155
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders
151156
CMAKE_ARGS ${VULKAN_SHADER_GEN_CMAKE_ARGS}
152-
BUILD_COMMAND ${CMAKE_COMMAND} --build .
157+
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS}
153158
INSTALL_COMMAND ${CMAKE_COMMAND} --install .
154159
INSTALL_DIR ${CMAKE_BINARY_DIR}
155160
)

0 commit comments

Comments
 (0)
0