Skip to content

Commit 742cd08

Browse files
committed
Update CMakeLists.txt for tools/mtmd
1 parent f1b41ae commit 742cd08

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,36 +143,36 @@ if (LLAMA_BUILD)
143143
add_compile_definitions(GGML_USE_METAL)
144144
endif()
145145

146-
# Building llava
147-
add_subdirectory(vendor/llama.cpp/tools/llava)
148-
set_target_properties(llava_shared PROPERTIES OUTPUT_NAME "llava")
146+
# Building mtmd
147+
add_subdirectory(vendor/llama.cpp/tools/mtmd)
148+
set_target_properties(mtmd_shared PROPERTIES OUTPUT_NAME "mtmd")
149149

150150
if (WIN32)
151-
set_target_properties(llava_shared PROPERTIES CUDA_ARCHITECTURES OFF)
151+
set_target_properties(mtmd_shared PROPERTIES CUDA_ARCHITECTURES OFF)
152152
endif()
153-
llama_cpp_python_install_target(llava_shared)
153+
llama_cpp_python_install_target(mtmd_shared)
154154
if (WIN32)
155155
install(
156-
FILES $<TARGET_RUNTIME_DLLS:llava_shared>
156+
FILES $<TARGET_RUNTIME_DLLS:mtmd_shared>
157157
DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/llama_cpp/lib
158158
)
159159
install(
160-
FILES $<TARGET_RUNTIME_DLLS:llava_shared>
160+
FILES $<TARGET_RUNTIME_DLLS:mtmd_shared>
161161
DESTINATION ${SKBUILD_PLATLIB_DIR}/llama_cpp/lib
162162
)
163163
endif()
164164

165-
# Fix for llava build: Add include directory for llama.h
165+
# Fix for mtmd build: Add include directory for llama.h
166166
# Move these commands after the add_subdirectory call
167-
target_include_directories(llava PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
168-
target_include_directories(llava PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/ggml/include)
167+
target_include_directories(mtmd PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
168+
target_include_directories(mtmd PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/ggml/include)
169169

170170
if (BUILD_SHARED_LIBS)
171-
target_include_directories(llava_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
172-
target_include_directories(llava_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/ggml/include)
171+
target_include_directories(mtmd_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
172+
target_include_directories(mtmd_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/ggml/include)
173173
endif()
174174

175-
target_include_directories(llama-llava-cli PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
176-
target_include_directories(llama-minicpmv-cli PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
175+
target_include_directories(llama-mtmd-cli PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
176+
target_include_directories(llama-llava-clip-quantize-cli PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp/include)
177177
endif()
178178
endif()

0 commit comments

Comments
 (0)