From f9e9792f1d5046d2514563a292aa668518c6291e Mon Sep 17 00:00:00 2001 From: KenForever1 <2962666298@qq.com> Date: Sun, 17 Nov 2024 13:36:14 +0800 Subject: [PATCH] common: compile shared lib, and export some c functions --- common/CMakeLists.txt | 4 +++- common/common.h | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 5ab1ffa19..536a3b3fc 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -50,7 +50,7 @@ endif() set(TARGET common) -add_library(${TARGET} STATIC +add_library(${TARGET} arg.cpp arg.h base64.hpp @@ -70,6 +70,8 @@ add_library(${TARGET} STATIC if (BUILD_SHARED_LIBS) set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON) + target_compile_definitions(${TARGET} PRIVATE LLAMA_BUILD) + target_compile_definitions(${TARGET} PUBLIC LLAMA_SHARED) endif() set(LLAMA_COMMON_EXTRA_LIBS build_info) diff --git a/common/common.h b/common/common.h index 7977cc7a9..2a11624da 100644 --- a/common/common.h +++ b/common/common.h @@ -41,6 +41,10 @@ extern char const * LLAMA_BUILD_TARGET; struct common_control_vector_load_info; +#ifdef __cplusplus +extern "C" { +#endif + // // CPU utils // @@ -54,8 +58,12 @@ struct cpu_params { uint32_t poll = 50; // Polling (busywait) level (0 - no polling, 100 - mostly polling) }; -int32_t cpu_get_num_physical_cores(); -int32_t cpu_get_num_math(); +LLAMA_API int32_t cpu_get_num_physical_cores(); +LLAMA_API int32_t cpu_get_num_math(); + +#ifdef __cplusplus +} +#endif // // Common params