|
@@ -144,9 +144,15 @@ if (Vulkan_FOUND)
|
|
|
${VULKAN_SHADER_GEN_CMAKE_ARGS}
|
|
${VULKAN_SHADER_GEN_CMAKE_ARGS}
|
|
|
|
|
|
|
|
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
|
|
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
|
|
|
- INSTALL_COMMAND ${CMAKE_COMMAND} --install . --config $<CONFIG>
|
|
|
|
|
|
|
+
|
|
|
|
|
+ # NOTE: When DESTDIR is set using Makefile generators and
|
|
|
|
|
+ # "make install" triggers the build step, vulkan-shaders-gen
|
|
|
|
|
+ # would be installed into the DESTDIR prefix, so it is unset
|
|
|
|
|
+ # to ensure that does not happen.
|
|
|
|
|
+
|
|
|
|
|
+ INSTALL_COMMAND ${CMAKE_COMMAND} -E env --unset=DESTDIR
|
|
|
|
|
+ ${CMAKE_COMMAND} --install . --config $<CONFIG>
|
|
|
)
|
|
)
|
|
|
- ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)
|
|
|
|
|
|
|
|
|
|
set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
|
|
set (_ggml_vk_host_suffix $<IF:$<STREQUAL:${CMAKE_HOST_SYSTEM_NAME},Windows>,.exe,>)
|
|
|
set (_ggml_vk_genshaders_dir "${CMAKE_BINARY_DIR}/$<CONFIG>")
|
|
set (_ggml_vk_genshaders_dir "${CMAKE_BINARY_DIR}/$<CONFIG>")
|
|
@@ -172,8 +178,6 @@ if (Vulkan_FOUND)
|
|
|
|
|
|
|
|
DEPENDS ${_ggml_vk_shader_files}
|
|
DEPENDS ${_ggml_vk_shader_files}
|
|
|
vulkan-shaders-gen
|
|
vulkan-shaders-gen
|
|
|
- vulkan-shaders-gen-build
|
|
|
|
|
- vulkan-shaders-gen-install
|
|
|
|
|
|
|
|
|
|
COMMENT "Generate vulkan shaders"
|
|
COMMENT "Generate vulkan shaders"
|
|
|
)
|
|
)
|