From: xiaobing318 <redacted>
Date: Wed, 20 Aug 2025 10:32:05 +0000 (+0800)
Subject: cmake : fix target include directories (#15450)
X-Git-Tag: upstream/0.0.6527~314
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=1a99c2d948209d9ea5eac8b6dc0a297107244540;p=pkg%2Fggml%2Fsources%2Fllama.cpp

cmake : fix target include directories (#15450)

* Update docker.yml

修改docker.yml文件中的内容使其停止周期性的运行该workflow，如果想要运行该workflow可以手动启动

* feat:Modify the header file include path

1. There's no llava directory in the tools directory.
2. Because the command `target_include_directories(mtmd PUBLIC .)` is used in the `mtmd` CMakeLists.txt file, other targets that link against `mtmd` automatically include the `mtmd` directory as a search path for header files. Therefore, you can remove `target_include_directories(${TARGET} PRIVATE ../llava`` or use `target_include_directories(${TARGET} PRIVATE ../mtmd`` to explicitly require the `llama-server` target to use header files from `mtmd`.

* Restore the docker.yml file
---

diff --git a/tools/server/CMakeLists.txt b/tools/server/CMakeLists.txt
index c2a56aaa..83b608c3 100644
--- a/tools/server/CMakeLists.txt
+++ b/tools/server/CMakeLists.txt
@@ -33,7 +33,7 @@ endforeach()
 add_executable(${TARGET} ${TARGET_SRCS})
 install(TARGETS ${TARGET} RUNTIME)
 
-target_include_directories(${TARGET} PRIVATE ../llava)
+target_include_directories(${TARGET} PRIVATE ../mtmd)
 target_include_directories(${TARGET} PRIVATE ${CMAKE_SOURCE_DIR})
 target_link_libraries(${TARGET} PRIVATE common mtmd ${CMAKE_THREAD_LIBS_INIT})