]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
cmake : fix target include directories (#15450)
authorxiaobing318 <redacted>
Wed, 20 Aug 2025 10:32:05 +0000 (18:32 +0800)
committerGitHub <redacted>
Wed, 20 Aug 2025 10:32:05 +0000 (13:32 +0300)
* 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

tools/server/CMakeLists.txt

index c2a56aaa7f27b35fef1c4955c8d6fff630e6a1c0..83b608c32a9c7898b2a29954f5d224181bd94051 100644 (file)
@@ -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})