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

get libllava to output in the right place

Browse source
This commit is contained in:
Damian Stewart 2023-10-14 18:59:40 +02:00
parent 708928c649
commit 09edb7ecdf
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
llava/CMakeLists.txt
View file

@ -1,9 +1,20 @@
set(TARGET llava) set(TARGET llava)
if (BUILD_SHARED_LIBS)
add_library(${TARGET} SHARED llava.cpp llava.h clip.cpp clip.h)
set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${TARGET} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
target_link_libraries(${TARGET} PUBLIC Threads::Threads common llama ggml ${LLAMA_EXTRA_LIBS})
install(TARGETS ${TARGET} LIBRARY)
else()
add_library(${TARGET} llava.cpp llava.h clip.cpp clip.h) add_library(${TARGET} llava.cpp llava.h clip.cpp clip.h)
target_link_libraries(${TARGET} PRIVATE common llama ggml ${CMAKE_THREAD_LIBS_INIT})
endif()
target_include_directories(${TARGET} PUBLIC .) target_include_directories(${TARGET} PUBLIC .)
target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(${TARGET} PUBLIC ..)
target_include_directories(${TARGET} PUBLIC ../common)
target_compile_features(${TARGET} PRIVATE cxx_std_11) target_compile_features(${TARGET} PRIVATE cxx_std_11)
if (NOT MSVC) if (NOT MSVC)
target_compile_options(${TARGET} PRIVATE -Wno-cast-qual) # stb_image.h target_compile_options(${TARGET} PRIVATE -Wno-cast-qual) # stb_image.h
@ -11,3 +22,4 @@ if (NOT MSVC)
if(TARGET BUILD_INFO) if(TARGET BUILD_INFO)
add_dependencies(${TARGET} BUILD_INFO) add_dependencies(${TARGET} BUILD_INFO)
endif() endif()