attempt to fix linker

Author: jathu

backends/apple/coreml/CMakeLists.txt

@@ -13,6 +13,8 @@ if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 17)
 endif()
 
+enable_language(OBJCXX)
+
 # Source root directory for executorch.
 if(NOT EXECUTORCH_ROOT)
   set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
@@ -116,20 +118,36 @@ set(PROTOBUF_SOURCES
     runtime/sdk/format/WordTagger.pb.cc
 )
 
+find_library(ACCELERATE_FRAMEWORK Accelerate)
+find_library(FOUNDATION_FRAMEWORK Foundation)
+find_library(COREML_FRAMEWORK CoreML)
+find_library(SQLITE_LIBRARY sqlite3)
+
 # CoreML util
 add_library(coreml_util)
 target_sources(coreml_util PRIVATE ${UTIL_SOURCES})
-target_include_directories(coreml_util
-  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
+target_include_directories(coreml_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util)
+target_link_libraries(coreml_util PRIVATE ${FOUNDATION_FRAMEWORK})
+
+install(
+  TARGETS coreml_util
+  DESTINATION lib
+  INCLUDES
+  DESTINATION ${_common_include_directories}
 )
 
 # CoreML inmemoryfs
 add_library(coreml_inmemoryfs)
 target_sources(coreml_inmemoryfs PRIVATE ${INMEMORYFS_SOURCES})
-target_include_directories(coreml_inmemoryfs
-  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs
+target_include_directories(coreml_inmemoryfs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs)
+target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util ${FOUNDATION_FRAMEWORK})
+
+install(
+  TARGETS coreml_inmemoryfs
+  DESTINATION lib
+  INCLUDES
+  DESTINATION ${_common_include_directories}
 )
-target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util)
 
 # Define the delegate library
 add_library(coremldelegate)
@@ -147,9 +165,6 @@ target_include_directories(
 target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
 target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type/c10)
 target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
-target_link_libraries(coremldelegate PRIVATE coreml_util)
-target_link_libraries(coremldelegate PRIVATE coreml_inmemoryfs)
-target_link_libraries(coremldelegate PRIVATE executorch_core)
 
 if(EXECUTORCH_BUILD_DEVTOOLS)
   target_sources(coremldelegate PRIVATE ${SDK_SOURCES} ${PROTOBUF_SOURCES})
@@ -167,15 +182,15 @@ if(EXECUTORCH_BUILD_DEVTOOLS)
   target_link_libraries(coremldelegate PRIVATE libprotobuf-lite)
 endif()
 
-find_library(ACCELERATE_FRAMEWORK Accelerate)
-find_library(COREML_FRAMEWORK CoreML)
-find_library(FOUNDATION_FRAMEWORK Foundation)
-find_library(SQLITE_LIBRARY sqlite3)
-
 target_link_libraries(
   coremldelegate
-  PRIVATE executorch_core ${ACCELERATE_FRAMEWORK} ${COREML_FRAMEWORK}
-          ${FOUNDATION_FRAMEWORK} ${SQLITE_LIBRARY}
+  PRIVATE coreml_util
+          coreml_inmemoryfs
+          executorch_core
+          ${ACCELERATE_FRAMEWORK}
+          ${COREML_FRAMEWORK}
+          ${FOUNDATION_FRAMEWORK}
+          ${SQLITE_LIBRARY}
 )
 
 target_link_options_shared_lib(coremldelegate)
@@ -199,10 +214,6 @@ else()
   target_compile_options(coremldelegate PRIVATE "-fno-rtti")
 endif()
 
-set(TARGET coremldelegate APPEND_STRING PROPERTY COMPILE_FLAGS
-           "-x objective-c++"
-)
-
 set(TARGET coremldelegate APPEND_STRING PROPERTY COMPILE_FLAGS
            "-Wno-null-character"
 )

examples/models/llama/CMakeLists.txt

@@ -193,12 +193,16 @@ if(TARGET coremldelegate)
   list(
     APPEND
     link_libraries
+    coreml_util
+    coreml_inmemoryfs
     coremldelegate
     sqlite3
     "-framework Foundation"
     "-framework CoreML"
     "-framework Accelerate"
   )
+  # target_link_options_shared_lib(coreml_util)
+  # target_link_options_shared_lib(coreml_inmemoryfs)
   target_link_options_shared_lib(coremldelegate)
 endif()
 

tools/cmake/executorch-config.cmake

@@ -67,6 +67,8 @@ set(lib_list
     bundled_program
     extension_data_loader
     ${FLATCCRT_LIB}
+    coreml_util
+    coreml_inmemoryfs
     coremldelegate
     mpsdelegate
     neuron_backend