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

Update omni-audio cmake content to make it static (#36)

Browse source 
* fix build error issue

* update omni audio cmake

* update omni audio cmake
This commit is contained in:
T 2024-12-10 14:50:28 +08:00 • committed by GitHub
parent 64a6001a1a
commit 5962b506ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
build/**

24
examples/nexa-omni-audio/CMakeLists.txt
View file

@ -20,7 +20,7 @@ target_link_libraries(${WHISPER_LIB} PRIVATE ggml llama common Threads::Threads)
# add nexa-omni-audio-lib library # add nexa-omni-audio-lib library
set(OMNI_AUDIO_LIB omni_audio) set(OMNI_AUDIO_LIB omni_audio)
add_library(${OMNI_AUDIO_LIB} OBJECT add_library(${OMNI_AUDIO_LIB} STATIC
omni.cpp omni.cpp
omni.h omni.h
audio-projector.cpp 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_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 ../..) target_include_directories(${OMNI_AUDIO_LIB} PUBLIC ../..)
target_include_directories(OMNI_AUDIO_LIB PUBLIC ../../common) target_include_directories(${OMNI_AUDIO_LIB} PUBLIC ../../common)
target_compile_features(OMNI_AUDIO_LIB PRIVATE cxx_std_11)
add_library(omni_audio_static STATIC $<TARGET_OBJECTS:OMNI_AUDIO_LIB>)
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_OBJECTS:OMNI_AUDIO_LIB>)
target_link_libraries(omni_audio_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT})
install(TARGETS omni_audio_shared LIBRARY)
endif()
target_compile_features(${OMNI_AUDIO_LIB} PRIVATE cxx_std_11)
add_library(omni_audio_static STATIC $<TARGET_OBJECTS:${OMNI_AUDIO_LIB}>)
# build the nexa-omni-cli # build the nexa-omni-cli
@ -78,4 +68,4 @@ if(BUILD_SHARED_LIBS)
if(MSVC) if(MSVC)
set_target_properties(${OMNI_AUDIO_LIB}_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) set_target_properties(${OMNI_AUDIO_LIB}_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif() endif()
endif() endif()