Export mtmd target

Author: jpgaribotti

CMakeLists.txt

@@ -243,6 +243,16 @@ if (LLAMA_BUILD_COMMON)
 
 endif()
 
+if (LLAMA_BUILD_TOOLS)
+
+  install(
+    TARGETS mtmd
+    EXPORT llama-targets
+    PUBLIC_HEADER
+      DESTINATION ${LLAMA_INCLUDE_INSTALL_DIR}/mtmd)
+
+endif()
+
 install(
   EXPORT llama-targets
   FILE llama-targets.cmake

tools/mtmd/CMakeLists.txt

@@ -15,7 +15,12 @@ add_library(mtmd
 
 target_link_libraries     (mtmd PUBLIC ggml llama)
 target_link_libraries     (mtmd PRIVATE Threads::Threads)
-target_include_directories(mtmd PUBLIC  .)
+target_include_directories(
+  mtmd
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
 target_include_directories(mtmd PRIVATE ../..)
 target_include_directories(mtmd PRIVATE ../../vendor)
 target_compile_features   (mtmd PRIVATE cxx_std_17)
@@ -35,8 +40,6 @@ set_target_properties(mtmd
     PROPERTIES
     PUBLIC_HEADER "${MTMD_PUBLIC_HEADERS}")
 
-install(TARGETS mtmd LIBRARY PUBLIC_HEADER)
-
 if (NOT MSVC)
     # for stb_image.h and miniaudio.h
     target_compile_options(mtmd PRIVATE -Wno-cast-qual)