From 15c1c79449213f20f714b81c30a56779e5b6056e Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Tue, 25 Jun 2024 15:09:18 +0300 Subject: [PATCH] cmake : build normal ggml library (not object library) [no ci] --- ggml/CMakeLists.txt | 2 +- ggml/src/CMakeLists.txt | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt index 1d5fc0716..f3763f7eb 100644 --- a/ggml/CMakeLists.txt +++ b/ggml/CMakeLists.txt @@ -207,7 +207,7 @@ set_target_properties(ggml PROPERTIES PUBLIC_HEADER "${GGML_PUBLIC_HEADERS}") install(TARGETS ggml PUBLIC_HEADER) if (BUILD_SHARED_LIBS) - install(TARGETS ggml_shared LIBRARY) + install(TARGETS ggml LIBRARY) endif() if (GGML_METAL) diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index 4f1460261..f0535ba3e 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -570,6 +570,7 @@ if (GGML_KOMPUTE) find_package(Vulkan COMPONENTS glslc REQUIRED) find_program(glslc_executable NAMES glslc HINTS Vulkan::glslc) + if (NOT glslc_executable) message(FATAL_ERROR "glslc not found") endif() @@ -1129,7 +1130,7 @@ endif() # ggml -add_library(ggml OBJECT +add_library(ggml ../include/ggml.h ../include/ggml-alloc.h ../include/ggml-backend.h @@ -1167,10 +1168,6 @@ if (MATH_LIBRARY) target_link_libraries(ggml PRIVATE ${MATH_LIBRARY}) endif() -add_library(ggml_static STATIC $) - if (BUILD_SHARED_LIBS) set_target_properties(ggml PROPERTIES POSITION_INDEPENDENT_CODE ON) - add_library(ggml_shared SHARED $) - target_link_libraries(ggml_shared PRIVATE Threads::Threads ${GGML_EXTRA_LIBS}) endif()