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

fix: Remove unnecessary Vulkan library linkage in CMakeLists.txt

Browse source 
Since `vulkan-shader-gen.cpp` only requires the `glslc` executable
and not the Vulkan headers or libraries, CMakeLists.txt needs to
be corrected.
(See: ecc93d0558)
This commit is contained in:
Junil Kim 2025-01-13 16:09:11 +09:00
parent efe4b14e60
commit 37d0cb6e84
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,11 @@
find_package (Threads REQUIRED) find_package (Threads REQUIRED)
find_package(Vulkan COMPONENTS glslc REQUIRED) find_program(GLSLC_EXECUTABLE glslc)
if(NOT GLSLC_EXECUTABLE)
message(FATAL_ERROR "glslc not found.")
endif()
set(TARGET vulkan-shaders-gen) set(TARGET vulkan-shaders-gen)
add_executable(${TARGET} vulkan-shaders-gen.cpp) add_executable(${TARGET} vulkan-shaders-gen.cpp)
install(TARGETS ${TARGET} RUNTIME) install(TARGETS ${TARGET} RUNTIME)
target_compile_features(${TARGET} PRIVATE cxx_std_17) target_compile_features(${TARGET} PRIVATE cxx_std_17)
target_link_libraries(vulkan-shaders-gen PUBLIC Threads::Threads) target_link_libraries(vulkan-shaders-gen PUBLIC Threads::Threads)
target_link_libraries(vulkan-shaders-gen PRIVATE Vulkan::Vulkan)

2
ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp
View file

@ -30,8 +30,6 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <vulkan/vulkan_core.h>
#define ASYNCIO_CONCURRENCY 64 #define ASYNCIO_CONCURRENCY 64
std::mutex lock; std::mutex lock;