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

fix conficts (#32)

Browse source
This commit is contained in:
T 2024-12-02 15:41:12 +08:00 • committed by GitHub
parent 661b3f718c
commit 0b15d2d745
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/omni-vlm/CMakeLists.txt
View file

@ -39,11 +39,7 @@ target_compile_features(${TARGET} PRIVATE cxx_std_11)
#=== for omni-vlm-wrapper #=== for omni-vlm-wrapper
add_library(omni_vlm_wrapper_shared SHARED omni-vlm-wrapper.cpp $<TARGET_OBJECTS:omni_vlm>) add_library(omni_vlm_wrapper_shared SHARED omni-vlm-wrapper.cpp $<TARGET_OBJECTS:omni_vlm>)
<<<<<<< HEAD
target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml llama ${CMAKE_THREAD_LIBS_INIT})
=======
target_link_libraries(omni_vlm_wrapper_shared PRIVATE common ggml_llama llama ${CMAKE_THREAD_LIBS_INIT})
>>>>>>> master
# For Nexa SDK library installation # For Nexa SDK library installation
set_target_properties(omni_vlm_wrapper_shared PROPERTIES set_target_properties(omni_vlm_wrapper_shared PROPERTIES
PUBLIC_HEADER "omni-vlm-wrapper.h" PUBLIC_HEADER "omni-vlm-wrapper.h"