Skip to content

Commit 5962b50

Browse files
authored
Update omni-audio cmake content to make it static (#36)
* fix build error issue * update omni audio cmake * update omni audio cmake
1 parent 64a6001 commit 5962b50

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build/**

examples/nexa-omni-audio/CMakeLists.txt

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,21 @@ target_link_libraries(${WHISPER_LIB} PRIVATE ggml llama common Threads::Threads)
2020

2121
# add nexa-omni-audio-lib library
2222
set(OMNI_AUDIO_LIB omni_audio)
23-
add_library(${OMNI_AUDIO_LIB} OBJECT
23+
add_library(${OMNI_AUDIO_LIB} STATIC
2424
omni.cpp
2525
omni.h
2626
audio-projector.cpp
2727
audio-projector.h
2828
)
2929
target_link_libraries(${OMNI_AUDIO_LIB} PRIVATE ggml llama common ${WHISPER_LIB})
3030

31-
target_include_directories(OMNI_AUDIO_LIB PUBLIC .)
32-
target_include_directories(OMNI_AUDIO_LIB PUBLIC ../..)
33-
target_include_directories(OMNI_AUDIO_LIB PUBLIC ../../common)
34-
35-
target_compile_features(OMNI_AUDIO_LIB PRIVATE cxx_std_11)
36-
37-
add_library(omni_audio_static STATIC $<TARGET_OBJECTS:OMNI_AUDIO_LIB>)
38-
if (BUILD_SHARED_LIBS)
39-
set_target_properties(OMNI_AUDIO_LIB PROPERTIES POSITION_INDEPENDENT_CODE ON)
40-
target_compile_definitions(OMNI_AUDIO_LIB PRIVATE LLAMA_SHARED LLAMA_BUILD)
41-
add_library(omni_audio_shared SHARED $<TARGET_OBJECTS:OMNI_AUDIO_LIB>)
42-
target_link_libraries(omni_audio_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT})
43-
install(TARGETS omni_audio_shared LIBRARY)
44-
endif()
45-
31+
target_include_directories(${OMNI_AUDIO_LIB} PUBLIC .)
32+
target_include_directories(${OMNI_AUDIO_LIB} PUBLIC ../..)
33+
target_include_directories(${OMNI_AUDIO_LIB} PUBLIC ../../common)
4634

35+
target_compile_features(${OMNI_AUDIO_LIB} PRIVATE cxx_std_11)
4736

37+
add_library(omni_audio_static STATIC $<TARGET_OBJECTS:${OMNI_AUDIO_LIB}>)
4838

4939

5040
# build the nexa-omni-cli
@@ -78,4 +68,4 @@ if(BUILD_SHARED_LIBS)
7868
if(MSVC)
7969
set_target_properties(${OMNI_AUDIO_LIB}_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
8070
endif()
81-
endif()
71+
endif()

0 commit comments

Comments
 (0)