From f8eddcf8e823c254280ca50ba04dd1154f59c6d7 Mon Sep 17 00:00:00 2001 From: Damian Stewart Date: Sat, 14 Oct 2023 13:13:40 +0200 Subject: [PATCH] collapse clip and llava libraries --- examples/llava/CMakeLists.txt | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/examples/llava/CMakeLists.txt b/examples/llava/CMakeLists.txt index 7e05bb3bf..d451690ad 100644 --- a/examples/llava/CMakeLists.txt +++ b/examples/llava/CMakeLists.txt @@ -1,5 +1,5 @@ -set(TARGET clip) -add_library(${TARGET} clip.cpp clip.h) +set(TARGET llava) +add_library(${TARGET} llava.cpp llava.h clip.cpp clip.h) install(TARGETS ${TARGET} LIBRARY) target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_11) @@ -10,22 +10,11 @@ if(TARGET BUILD_INFO) add_dependencies(${TARGET} BUILD_INFO) endif() -set(TARGET llava) -add_library(${TARGET} llava.cpp llava.h) -install(TARGETS ${TARGET} LIBRARY) -target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) -target_compile_features(${TARGET} PRIVATE cxx_std_11) -if (NOT MSVC) - target_compile_options(${TARGET} PRIVATE -Wno-cast-qual) # stb_image.h - endif() -if(TARGET BUILD_INFO) - add_dependencies(${TARGET} BUILD_INFO) -endif() set(TARGET llava-cli) add_executable(${TARGET} llava-cli.cpp) install(TARGETS ${TARGET} RUNTIME) -target_link_libraries(${TARGET} PRIVATE common llama clip llava ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${TARGET} PRIVATE common llama llava ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_11) if(TARGET BUILD_INFO) add_dependencies(${TARGET} BUILD_INFO)