Skip to content

Commit 1a99c2d

Browse files
authored
cmake : fix target include directories (ggml-org#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
1 parent 37f10f9 commit 1a99c2d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/server/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ endforeach()
3333
add_executable(${TARGET} ${TARGET_SRCS})
3434
install(TARGETS ${TARGET} RUNTIME)
3535

36-
target_include_directories(${TARGET} PRIVATE ../llava)
36+
target_include_directories(${TARGET} PRIVATE ../mtmd)
3737
target_include_directories(${TARGET} PRIVATE ${CMAKE_SOURCE_DIR})
3838
target_link_libraries(${TARGET} PRIVATE common mtmd ${CMAKE_THREAD_LIBS_INIT})
3939

0 commit comments

Comments
 (0)