Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 10, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
becc592
fix build error issue
TerryT9 Dec 10, 2024
470c31c
update omni audio cmake
TerryT9 Dec 10, 2024
eb04dc2
update omni audio cmake
TerryT9 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build/**
24 changes: 7 additions & 17 deletions examples/nexa-omni-audio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,21 @@ 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
audio-projector.h
)
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 $<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_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 $<TARGET_OBJECTS:${OMNI_AUDIO_LIB}>)


# build the nexa-omni-cli
Expand Down Expand Up @@ -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()