Skip to content

Commit c465030

Browse files
authored
cmake: remove shader-gen step-targets from ggml-vulkan (#14226)
* Remove step-targets from vulkan-shaders-gen * Unset DESTDIR when building vulkan-shaders-gen
1 parent 860a9e4 commit c465030

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

ggml/src/ggml-vulkan/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,15 @@ if (Vulkan_FOUND)
144144
${VULKAN_SHADER_GEN_CMAKE_ARGS}
145145

146146
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
147-
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --config $<CONFIG>
147+
148+
# NOTE: When DESTDIR is set using Makefile generators and
149+
# "make install" triggers the build step, vulkan-shaders-gen
150+
# would be installed into the DESTDIR prefix, so it is unset
151+
# to ensure that does not happen.
152+
153+
INSTALL_COMMAND ${CMAKE_COMMAND} -E env --unset=DESTDIR
154+
${CMAKE_COMMAND} --install . --config $<CONFIG>
148155
)
149-
ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)
150156

151157
set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
152158
set (_ggml_vk_genshaders_dir "${CMAKE_BINARY_DIR}/$<CONFIG>")
@@ -172,8 +178,6 @@ if (Vulkan_FOUND)
172178

173179
DEPENDS ${_ggml_vk_shader_files}
174180
vulkan-shaders-gen
175-
vulkan-shaders-gen-build
176-
vulkan-shaders-gen-install
177181

178182
COMMENT "Generate vulkan shaders"
179183
)

0 commit comments

Comments
 (0)