vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: ggml: Fix compile error

Browse source 
Fix compile error not finding vulkan-shaders-gen
This commit is contained in:
Junil Kim 2025-01-10 19:00:47 +09:00
parent 1921b9d39c
commit b6ebd4fc8c
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ggml/src/ggml-vulkan/CMakeLists.txt
View file

@ -137,7 +137,7 @@ if (Vulkan_FOUND)
)
ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)
endif()
set (_ggml_vk_genshaders_cmd ${CMAKE_BINARY_DIR}/bin/vulkan-shaders-gen)
set (_ggml_vk_genshaders_cmd ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/vulkan-shaders-gen)
set (_ggml_vk_header ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
set (_ggml_vk_source ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp)
set (_ggml_vk_input_dir ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
@ -145,10 +145,6 @@ if (Vulkan_FOUND)
file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")
if (NOT CMAKE_CROSSCOMPILING)
set(_ggml_vk_genshaders_cmd "$<TARGET_FILE_DIR:vulkan-shaders-gen>/${_ggml_vk_genshaders_cmd}")
endif ()
if (CMAKE_CROSSCOMPILING)
set(_ggml_vk_shader_deps ${_ggml_vk_shader_deps} vulkan-shaders-gen-build vulkan-shaders-gen-install)
endif()

6
ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt
View file

@ -3,11 +3,7 @@ find_package(Vulkan COMPONENTS glslc REQUIRED)
set(TARGET vulkan-shaders-gen)
add_executable(${TARGET} vulkan-shaders-gen.cpp)
if (${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
install(TARGETS ${TARGET} RUNTIME)
else()
install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
endif()
install(TARGETS ${TARGET} RUNTIME)
target_compile_features(${TARGET} PRIVATE cxx_std_17)
target_link_libraries(vulkan-shaders-gen PUBLIC Threads::Threads)
target_link_libraries(vulkan-shaders-gen PRIVATE Vulkan::Vulkan)