Skip to content

Commit 8cb0923

Browse files
committed
MINIFICPP-2719 - Do not build executable tools
1 parent e42024f commit 8cb0923

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

cmake/LlamaCpp.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ set(LLAMA_BUILD_TESTS "OFF" CACHE STRING "" FORCE)
2222
set(LLAMA_BUILD_EXAMPLES "OFF" CACHE STRING "" FORCE)
2323
set(LLAMA_BUILD_SERVER "OFF" CACHE STRING "" FORCE)
2424
set(LLAMA_BUILD_COMMON "ON" CACHE STRING "" FORCE)
25-
set(LLAMA_BUILD_TOOLS "ON" CACHE STRING "" FORCE)
2625
set(GGML_OPENMP "OFF" CACHE STRING "" FORCE)
2726
set(GGML_METAL "OFF" CACHE STRING "" FORCE)
2827
set(GGML_BLAS "OFF" CACHE STRING "" FORCE)
@@ -32,9 +31,16 @@ else()
3231
set(GGML_NATIVE "ON" CACHE STRING "" FORCE)
3332
endif()
3433

34+
set(PATCH_FILE_1 "${CMAKE_SOURCE_DIR}/thirdparty/llamacpp/mtmd-fix.patch")
35+
36+
set(PC ${Bash_EXECUTABLE} -c "set -x &&\
37+
(\\\"${Patch_EXECUTABLE}\\\" -p1 -R -s -f --dry-run -i \\\"${PATCH_FILE_1}\\\" || \\\"${Patch_EXECUTABLE}\\\" -p1 -N -i \\\"${PATCH_FILE_1}\\\")")
38+
39+
3540
FetchContent_Declare(llamacpp
3641
URL https://github.com/ggml-org/llama.cpp/archive/refs/tags/b7836.tar.gz
3742
URL_HASH SHA256=3d384e7e8b3bc3cd31abddedf684a6e201405c1d932cafb3c4a5277d872b0614
43+
PATCH_COMMAND "${PC}"
3844
SYSTEM
3945
)
4046

thirdparty/llamacpp/mtmd-fix.patch

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --color=auto -rupN llamacpp-src-original/CMakeLists.txt llamacpp-src-patched/CMakeLists.txt
2+
--- llamacpp-src-original/CMakeLists.txt 2026-01-25 21:19:47
3+
+++ llamacpp-src-patched/CMakeLists.txt 2026-02-18 13:15:46
4+
@@ -212,6 +212,7 @@ add_subdirectory(src)
5+
#
6+
7+
add_subdirectory(src)
8+
+add_subdirectory(tools/mtmd)
9+
10+
#
11+
# utils, programs, examples and tests
12+
diff --color=auto -rupN llamacpp-src-original/tools/mtmd/CMakeLists.txt llamacpp-src-patched/tools/mtmd/CMakeLists.txt
13+
--- llamacpp-src-original/tools/mtmd/CMakeLists.txt 2026-01-25 21:19:47
14+
+++ llamacpp-src-patched/tools/mtmd/CMakeLists.txt 2026-02-18 13:13:40
15+
@@ -80,16 +80,3 @@ endif()
16+
endif()
17+
endif()
18+
19+
-add_executable(llama-llava-cli deprecation-warning.cpp)
20+
-add_executable(llama-gemma3-cli deprecation-warning.cpp)
21+
-add_executable(llama-minicpmv-cli deprecation-warning.cpp)
22+
-add_executable(llama-qwen2vl-cli deprecation-warning.cpp)
23+
-
24+
-set(TARGET llama-mtmd-cli)
25+
-add_executable (${TARGET} mtmd-cli.cpp)
26+
-set_target_properties (${TARGET} PROPERTIES OUTPUT_NAME llama-mtmd-cli)
27+
-if(LLAMA_TOOLS_INSTALL)
28+
- install(TARGETS ${TARGET} RUNTIME)
29+
-endif()
30+
-target_link_libraries (${TARGET} PRIVATE common mtmd Threads::Threads)
31+
-target_compile_features(${TARGET} PRIVATE cxx_std_17)

0 commit comments

Comments
 (0)