Spaces:
Running
Running
Gilad S.
commited on
Commit
·
7681e32
1
Parent(s):
ad8b504
cmake: use the current build config for vulkan-shaders-gen (llama/13595)
Browse files* fix: use the current build config for `vulkan-shaders-gen`
* fix: only pass a valid build type to `--config`
ggml/src/ggml-vulkan/CMakeLists.txt
CHANGED
|
@@ -54,6 +54,11 @@ if (Vulkan_FOUND)
|
|
| 54 |
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
| 55 |
)
|
| 56 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
# Test all shader extensions
|
| 58 |
test_shader_extension_support(
|
| 59 |
"GL_KHR_cooperative_matrix"
|
|
@@ -149,7 +154,7 @@ if (Vulkan_FOUND)
|
|
| 149 |
vulkan-shaders-gen
|
| 150 |
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders
|
| 151 |
CMAKE_ARGS ${VULKAN_SHADER_GEN_CMAKE_ARGS}
|
| 152 |
-
BUILD_COMMAND ${CMAKE_COMMAND} --build .
|
| 153 |
INSTALL_COMMAND ${CMAKE_COMMAND} --install .
|
| 154 |
INSTALL_DIR ${CMAKE_BINARY_DIR}
|
| 155 |
)
|
|
|
|
| 54 |
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
| 55 |
)
|
| 56 |
|
| 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 |
+
|
| 62 |
# Test all shader extensions
|
| 63 |
test_shader_extension_support(
|
| 64 |
"GL_KHR_cooperative_matrix"
|
|
|
|
| 154 |
vulkan-shaders-gen
|
| 155 |
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders
|
| 156 |
CMAKE_ARGS ${VULKAN_SHADER_GEN_CMAKE_ARGS}
|
| 157 |
+
BUILD_COMMAND ${CMAKE_COMMAND} --build . ${VULKAN_SHADER_GEN_CMAKE_BUILD_ARGS}
|
| 158 |
INSTALL_COMMAND ${CMAKE_COMMAND} --install .
|
| 159 |
INSTALL_DIR ${CMAKE_BINARY_DIR}
|
| 160 |
)
|