bandoti commited on
Commit
b7a7257
·
1 Parent(s): a1bcb29

cmake: remove shader-gen step-targets from ggml-vulkan (llama/14226)

Browse files

* Remove step-targets from vulkan-shaders-gen

* Unset DESTDIR when building vulkan-shaders-gen

ggml/src/ggml-vulkan/CMakeLists.txt CHANGED
@@ -144,9 +144,15 @@ if (Vulkan_FOUND)
144
  ${VULKAN_SHADER_GEN_CMAKE_ARGS}
145
 
146
  BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
147
- INSTALL_COMMAND ${CMAKE_COMMAND} --install . --config $<CONFIG>
 
 
 
 
 
 
 
148
  )
149
- ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)
150
 
151
  set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
152
  set (_ggml_vk_genshaders_dir "${CMAKE_BINARY_DIR}/$<CONFIG>")
@@ -172,8 +178,6 @@ if (Vulkan_FOUND)
172
 
173
  DEPENDS ${_ggml_vk_shader_files}
174
  vulkan-shaders-gen
175
- vulkan-shaders-gen-build
176
- vulkan-shaders-gen-install
177
 
178
  COMMENT "Generate vulkan shaders"
179
  )
 
144
  ${VULKAN_SHADER_GEN_CMAKE_ARGS}
145
 
146
  BUILD_COMMAND ${CMAKE_COMMAND} --build . --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>
155
  )
 
156
 
157
  set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
158
  set (_ggml_vk_genshaders_dir "${CMAKE_BINARY_DIR}/$<CONFIG>")
 
178
 
179
  DEPENDS ${_ggml_vk_shader_files}
180
  vulkan-shaders-gen
 
 
181
 
182
  COMMENT "Generate vulkan shaders"
183
  )