Skip to content

Commit d763b3e

Browse files
bandotiMinh141120
authored andcommitted
cmake: remove shader-gen step-targets from ggml-vulkan (ggml-org#14226)
* Remove step-targets from vulkan-shaders-gen * Unset DESTDIR when building vulkan-shaders-gen
1 parent 4143c93 commit d763b3e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ggml/src/ggml-vulkan/CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,14 @@ if (Vulkan_FOUND)
146146
${VULKAN_SHADER_GEN_CMAKE_ARGS}
147147

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

152159
set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
@@ -174,8 +181,6 @@ if (Vulkan_FOUND)
174181

175182
DEPENDS ${_ggml_vk_shader_files}
176183
vulkan-shaders-gen
177-
vulkan-shaders-gen-build
178-
vulkan-shaders-gen-install
179184

180185
COMMENT "Generate vulkan shaders"
181186
)

0 commit comments

Comments
 (0)