Skip to content

Commit 3720825

Browse files
committed
Add install step to normalize msvc with make
1 parent d99def2 commit 3720825

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

ggml/src/ggml-vulkan/CMakeLists.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,18 @@ if (Vulkan_FOUND)
139139
vulkan-shaders-gen
140140
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders
141141
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/$<CONFIG>
142+
-DCMAKE_INSTALL_BINDIR=.
142143
-DCMAKE_BUILD_TYPE=$<CONFIG>
143144
${VULKAN_SHADER_GEN_CMAKE_ARGS}
144145

145-
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
146+
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
147+
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --config $<CONFIG>
146148
)
147-
ExternalProject_Add_StepTargets(vulkan-shaders-gen build)
149+
ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)
148150

149151
set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
150-
set (_ggml_vk_genshaders_dir "$<TARGET_PROPERTY:vulkan-shaders-gen,_EP_BINARY_DIR>")
151-
set (_ggml_vk_genshaders_cmd "${_ggml_vk_genshaders_dir}/$<CONFIG>/vulkan-shaders-gen${_ggml_vk_host_suffix}")
152+
set (_ggml_vk_genshaders_dir "${CMAKE_BINARY_DIR}/$<CONFIG>")
153+
set (_ggml_vk_genshaders_cmd "${_ggml_vk_genshaders_dir}/vulkan-shaders-gen${_ggml_vk_host_suffix}")
152154
set (_ggml_vk_header "${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp")
153155
set (_ggml_vk_source "${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp")
154156
set (_ggml_vk_input_dir "${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders")
@@ -157,8 +159,8 @@ if (Vulkan_FOUND)
157159
file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")
158160
set (_ggml_vk_shader_deps ${_ggml_vk_shader_deps} vulkan-shaders-gen)
159161

160-
# Add build dependencies for all builds
161-
set(_ggml_vk_shader_deps ${_ggml_vk_shader_deps} vulkan-shaders-gen-build)
162+
# Add build and install dependencies for all builds
163+
set(_ggml_vk_shader_deps ${_ggml_vk_shader_deps} vulkan-shaders-gen-build vulkan-shaders-gen-install)
162164

163165
add_custom_command(
164166
OUTPUT ${_ggml_vk_header}

0 commit comments

Comments
 (0)