fix: ggml: Fix compile error

Fix compile error not finding vulkan-shaders-gen
ggerganov · Jan 10, 2025 · d1aec44 · d1aec44
1 parent 1921b9d
commit d1aec44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ggml/src/ggml-vulkan/CMakeLists.txt b/ggml/src/ggml-vulkan/CMakeLists.txt
@@ -137,17 +137,15 @@ 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 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)
     set (_ggml_vk_output_dir ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shaders.spv)
 
     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 ()
+    set(_ggml_vk_genshaders_cmd "$<TARGET_FILE_DIR:vulkan-shaders-gen>/${_ggml_vk_genshaders_cmd}")
 
     if (CMAKE_CROSSCOMPILING)
         set(_ggml_vk_shader_deps ${_ggml_vk_shader_deps} vulkan-shaders-gen-build vulkan-shaders-gen-install)

diff --git a/ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt b/ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt
@@ -3,7 +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})
+if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
     install(TARGETS ${TARGET} RUNTIME)
 else()
     install(TARGETS ${TARGET} RUNTIME DESTINATION bin)