Update

[ghstack-poisoned]

Author: swolchok

backends/xnnpack/cmake/Dependencies.cmake

@@ -22,6 +22,9 @@ set(XNNPACK_STATIC_LIB
 set(XNNPACK_MICROKERNELS_STATIC_LIB
     "${XNNPACK_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libxnnpack-microkernels-prod.a"
 )
+set(KLEIDIAI_STATIC_LIB
+    "${XNNPACK_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libkleidiai.a"
+)
 get_extra_cmake_args_for_external_project(XNNPACK_EXTRA_CMAKE_ARGS)
 ExternalProject_Add(
   XNNPACKExternalProject
@@ -30,6 +33,7 @@ ExternalProject_Add(
   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/XNNPACK
   INSTALL_DIR ${XNNPACK_INSTALL_DIR}
   INSTALL_BYPRODUCTS ${XNNPACK_STATIC_LIB} ${XNNPACK_MICROKERNELS_STATIC_LIB}
+  ${KLEIDIAI_STATIC_LIB}
   CMAKE_ARGS
     ${XNNPACK_EXTRA_CMAKE_ARGS}
     -D
@@ -49,7 +53,7 @@ ExternalProject_Add(
     -D
     ENABLE_XNNPACK_SHARED_WORKSPACE=${EXECUTORCH_XNNPACK_SHARED_WORKSPACE}
     -D
-    XNNPACK_ENABLE_KLEIDIAI=${EXECUTORCH_XNNPACK_ENABLE_KLEIDIAI}
+    XNNPACK_ENABLE_KLEIDIAI=${EXECUTORCH_XNNPACK_ENABLE_KLEIDI}
     -D
     CMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -D
@@ -79,14 +83,15 @@ install(DIRECTORY ${XNNPACK_INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 if(EXECUTORCH_XNNPACK_ENABLE_KLEIDI)
   add_library(kleidiai SHARED IMPORTED)
-  find_library(
-    KLEIDIAI_LIBRARY kleidiai
-    PATHS "${CMAKE_CURRENT_BINARY_DIR}/XNNPACK/kleidiai-source"
+  install(FILES ${KLEIDIAI_STATIC_LIB} PUBLIC_HEADER
+          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+  set_property(
+    TARGET kleidiai PROPERTY IMPORTED_LOCATION ${KLEIDIAI_STATIC_LIB}
+  )
+  set_property(
+    TARGET XNNPACK
+    APPEND
+    PROPERTY INTERFACE_LINK_LIBRARIES kleidiai
   )
-  if(KLEIDIAI_LIBRARY)
-    message(WARNING "Can't find KleidiAI, skipping install")
-    install(FILES ${KLEIDIAI_LIBRARY} PUBLIC_HEADER
-            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    )
-  endif()
 endif()