From d1aec443c0406d0ae8f74f6f3ea731b2dfbbc30f Mon Sep 17 00:00:00 2001 From: Junil Kim Date: Fri, 10 Jan 2025 19:00:47 +0900 Subject: [PATCH] fix: ggml: Fix compile error Fix compile error not finding vulkan-shaders-gen --- ggml/src/ggml-vulkan/CMakeLists.txt | 6 ++---- ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ggml/src/ggml-vulkan/CMakeLists.txt b/ggml/src/ggml-vulkan/CMakeLists.txt index a228d112036010..dc6a5c82ccacb6 100644 --- a/ggml/src/ggml-vulkan/CMakeLists.txt +++ b/ggml/src/ggml-vulkan/CMakeLists.txt @@ -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 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,9 +145,7 @@ if (Vulkan_FOUND) file(GLOB _ggml_vk_shader_deps "${_ggml_vk_input_dir}/*.comp") - if (NOT CMAKE_CROSSCOMPILING) - set(_ggml_vk_genshaders_cmd "$/${_ggml_vk_genshaders_cmd}") - endif () + set(_ggml_vk_genshaders_cmd "$/${_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 index 8f496d6c6b2ecf..f3485a7da9d11d 100644 --- 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)