From 166952adc97264986652bd1fd122404544d3aee9 Mon Sep 17 00:00:00 2001 From: l3utterfly Date: Sat, 16 Nov 2024 15:28:32 +0800 Subject: [PATCH] added back android log library --- ggml/src/CMakeLists.txt | 14 ++++++++------ ggml/src/kompute | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) create mode 160000 ggml/src/kompute diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index bec23dcae3f90..a7186bf72a3c8 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -202,12 +202,6 @@ endif() # ggml -# Search for the 'log' library on Android -if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Android") - find_library(log-lib log) - set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${log-lib}) -endif() - add_library(ggml-base ../include/ggml.h ../include/ggml-alloc.h @@ -223,6 +217,14 @@ add_library(ggml-base ggml-aarch64.c ggml-aarch64.h) +# Search for the 'log' library on Android +if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Android") + find_library(log-lib log) + set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${log-lib}) + + target_link_libraries(ggml-base PUBLIC ${GGML_EXTRA_LIBS}) +endif() + target_include_directories(ggml-base PRIVATE .) add_library(ggml diff --git a/ggml/src/kompute b/ggml/src/kompute new file mode 160000 index 0000000000000..4565194ed7c32 --- /dev/null +++ b/ggml/src/kompute @@ -0,0 +1 @@ +Subproject commit 4565194ed7c32d1d2efa32ceab4d3c6cae006306