Skip to content

Commit b6ebd4f

Browse files
committed
fix: ggml: Fix compile error
Fix compile error not finding vulkan-shaders-gen
1 parent 1921b9d commit b6ebd4f

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

ggml/src/ggml-vulkan/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,14 @@ if (Vulkan_FOUND)
137137
)
138138
ExternalProject_Add_StepTargets(vulkan-shaders-gen build install)
139139
endif()
140-
set (_ggml_vk_genshaders_cmd ${CMAKE_BINARY_DIR}/bin/vulkan-shaders-gen)
140+
set (_ggml_vk_genshaders_cmd ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/vulkan-shaders-gen)
141141
set (_ggml_vk_header ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.hpp)
142142
set (_ggml_vk_source ${CMAKE_CURRENT_BINARY_DIR}/ggml-vulkan-shaders.cpp)
143143
set (_ggml_vk_input_dir ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders)
144144
set (_ggml_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
145145

146146
file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp")
147147

148-
if (NOT CMAKE_CROSSCOMPILING)
149-
set(_ggml_vk_genshaders_cmd "$<TARGET_FILE_DIR:vulkan-shaders-gen>/${_ggml_vk_genshaders_cmd}")
150-
endif ()
151-
152148
if (CMAKE_CROSSCOMPILING)
153149
set(_ggml_vk_shader_deps ${_ggml_vk_shader_deps} vulkan-shaders-gen-build vulkan-shaders-gen-install)
154150
endif()

ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ find_package(Vulkan COMPONENTS glslc REQUIRED)
33

44
set(TARGET vulkan-shaders-gen)
55
add_executable(${TARGET} vulkan-shaders-gen.cpp)
6-
if (${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
7-
install(TARGETS ${TARGET} RUNTIME)
8-
else()
9-
install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
10-
endif()
6+
install(TARGETS ${TARGET} RUNTIME)
117
target_compile_features(${TARGET} PRIVATE cxx_std_17)
128
target_link_libraries(vulkan-shaders-gen PUBLIC Threads::Threads)
139
target_link_libraries(vulkan-shaders-gen PRIVATE Vulkan::Vulkan)

0 commit comments

Comments
 (0)