test

Author: amakropoulos

CMakeLists.txt

@@ -97,9 +97,8 @@ function(LLAMALIB_COMPILE_DEFS NAME)
         target_compile_definitions(${NAME} PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
         target_link_libraries(${NAME} PRIVATE cpp-httplib OpenSSL::SSL OpenSSL::Crypto)
     endif()
-    if(ARCHITECTURE MATCHES "android" AND ARCHITECTURE MATCHES "vulkan")
+    if(CMAKE_SYSTEM_NAME STREQUAL "Android")
         target_link_options(${NAME} PRIVATE "-Wl,-z,max-page-size=16384")
-        target_link_libraries(${NAME} PRIVATE "${Vulkan_LIBRARY}")
     endif()
 endfunction()
 

src/CMakeLists.txt

@@ -24,6 +24,9 @@ add_library(
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     target_link_options(${LLAMALIB_ARCHITECTURE_LIBRARY} PRIVATE -Wl,--no-undefined)
 endif()
+if(ARCHITECTURE MATCHES "android" AND ARCHITECTURE MATCHES "vulkan")
+    target_link_libraries(${LLAMALIB_ARCHITECTURE_LIBRARY} PRIVATE "${Vulkan_LIBRARY}")
+endif()
 LLAMALIB_COMPILE_DEFS(${LLAMALIB_ARCHITECTURE_LIBRARY})
 target_include_directories(${LLAMALIB_ARCHITECTURE_LIBRARY} PRIVATE "${LLAMA_CPP_ROOT}/src" "${LLAMA_CPP_ROOT}/ggml/include" "${LLAMA_CPP_ROOT}/tools/server" "${LLAMA_CPP_ROOT}/tools/mtmd" "${LLAMA_CPP_ROOT}/common")
 target_link_libraries(${LLAMALIB_ARCHITECTURE_LIBRARY} PRIVATE common mtmd)

third_party/CMakeLists.txt

@@ -172,9 +172,9 @@ if(ARCHITECTURE MATCHES "tinyblas")
     endforeach()
 endif()
 
-if(ARCHITECTURE MATCHES "android")
-    if (TARGET ggml-vulkan)
-        target_include_directories(ggml-vulkan PRIVATE ${Vulkan_INCLUDE_DIR})
-        target_link_libraries(ggml-vulkan PRIVATE "${Vulkan_LIBRARY}")
-    endif()
-endif()
+# if(ARCHITECTURE MATCHES "android")
+#     if (TARGET ggml-vulkan)
+#         target_include_directories(ggml-vulkan PRIVATE ${Vulkan_INCLUDE_DIR})
+#         target_link_libraries(ggml-vulkan PRIVATE "${Vulkan_LIBRARY}")
+#     endif()
+# endif()