From 5962b506bab3f46821e0fb74bcbe224cb6b10b68 Mon Sep 17 00:00:00 2001 From: T <3923106166@qq.com> Date: Tue, 10 Dec 2024 14:50:28 +0800 Subject: [PATCH] Update omni-audio cmake content to make it static (#36) * fix build error issue * update omni audio cmake * update omni audio cmake --- .gitignore | 1 + examples/nexa-omni-audio/CMakeLists.txt | 24 +++++++----------------- 2 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..e390b124a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/** \ No newline at end of file diff --git a/examples/nexa-omni-audio/CMakeLists.txt b/examples/nexa-omni-audio/CMakeLists.txt index a99a02bd0..252787165 100644 --- a/examples/nexa-omni-audio/CMakeLists.txt +++ b/examples/nexa-omni-audio/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(${WHISPER_LIB} PRIVATE ggml llama common Threads::Threads) # add nexa-omni-audio-lib library set(OMNI_AUDIO_LIB omni_audio) -add_library(${OMNI_AUDIO_LIB} OBJECT +add_library(${OMNI_AUDIO_LIB} STATIC omni.cpp omni.h audio-projector.cpp @@ -28,23 +28,13 @@ add_library(${OMNI_AUDIO_LIB} OBJECT ) target_link_libraries(${OMNI_AUDIO_LIB} PRIVATE ggml llama common ${WHISPER_LIB}) -target_include_directories(OMNI_AUDIO_LIB PUBLIC .) -target_include_directories(OMNI_AUDIO_LIB PUBLIC ../..) -target_include_directories(OMNI_AUDIO_LIB PUBLIC ../../common) - -target_compile_features(OMNI_AUDIO_LIB PRIVATE cxx_std_11) - -add_library(omni_audio_static STATIC $) -if (BUILD_SHARED_LIBS) - set_target_properties(OMNI_AUDIO_LIB PROPERTIES POSITION_INDEPENDENT_CODE ON) - target_compile_definitions(OMNI_AUDIO_LIB PRIVATE LLAMA_SHARED LLAMA_BUILD) - add_library(omni_audio_shared SHARED $) - target_link_libraries(omni_audio_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT}) - install(TARGETS omni_audio_shared LIBRARY) -endif() - +target_include_directories(${OMNI_AUDIO_LIB} PUBLIC .) +target_include_directories(${OMNI_AUDIO_LIB} PUBLIC ../..) +target_include_directories(${OMNI_AUDIO_LIB} PUBLIC ../../common) +target_compile_features(${OMNI_AUDIO_LIB} PRIVATE cxx_std_11) +add_library(omni_audio_static STATIC $) # build the nexa-omni-cli @@ -78,4 +68,4 @@ if(BUILD_SHARED_LIBS) if(MSVC) set_target_properties(${OMNI_AUDIO_LIB}_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() -endif() +endif() \ No newline at end of file