Merge pull request #19 from jpgaribotti/QVAC-6114

QVAC-6114: Fix CMakeLists to support building with LLAMA_MTMD on or off

Author: jpgaribotti

CMakeLists.txt

@@ -213,10 +213,8 @@ endif()
 
 if (LLAMA_BUILD_COMMON AND LLAMA_BUILD_TOOLS)
     add_subdirectory(tools)
-endif()
-
-if (LLAMA_MTMD)
-  add_subdirectory(tools/mtmd)
+elseif (LLAMA_MTMD)
+    add_subdirectory(tools/mtmd)
 endif()
 
 #

tests/CMakeLists.txt

@@ -214,9 +214,11 @@ if (NOT GGML_BACKEND_DL)
 endif()
 
 # libmtmd
-set(LLAMA_TEST_NAME test-mtmd-c-api)
-llama_build_and_test(test-mtmd-c-api.c)
-target_link_libraries(${LLAMA_TEST_NAME} PRIVATE mtmd)
+if (LLAMA_MTMD)
+    set(LLAMA_TEST_NAME test-mtmd-c-api)
+    llama_build_and_test(test-mtmd-c-api.c)
+    target_link_libraries(${LLAMA_TEST_NAME} PRIVATE mtmd)
+endif()
 
 # dummy executable - not installed
 get_filename_component(TEST_TARGET test-c.c NAME_WE)

tools/CMakeLists.txt

@@ -21,13 +21,15 @@ else()
     add_subdirectory(main)
     add_subdirectory(perplexity)
     add_subdirectory(quantize)
-    if (LLAMA_BUILD_SERVER)
+    if (LLAMA_BUILD_SERVER AND LLAMA_MTMD)
         add_subdirectory(server)
     endif()
     add_subdirectory(run)
     add_subdirectory(tokenize)
     add_subdirectory(tts)
-    add_subdirectory(mtmd)
+    if (LLAMA_MTMD)
+        add_subdirectory(mtmd)
+    endif()
     if (GGML_RPC)
         add_subdirectory(rpc)
     endif()