split targets

Author: jathu

backends/apple/coreml/CMakeLists.txt

@@ -20,15 +20,6 @@ endif()
 
 option(COREML_BUILD_EXECUTOR_RUNNER "Build CoreML executor runner." OFF)
 
-# inmemoryfs sources
-set(INMEMORYFS_SOURCES
-    runtime/inmemoryfs/inmemory_filesystem.cpp
-    runtime/inmemoryfs/inmemory_filesystem_utils.mm
-    runtime/inmemoryfs/memory_buffer.cpp
-    runtime/inmemoryfs/memory_stream.cpp
-    runtime/inmemoryfs/reversed_memory_stream.cpp
-)
-
 # kvstore sources
 set(KVSTORE_SOURCES
     runtime/kvstore/database.cpp runtime/kvstore/json_key_value_store.cpp
@@ -56,9 +47,6 @@ set(DELEGATE_SOURCES
     runtime/delegate/serde_json.mm
 )
 
-# util sources
-set(UTIL_SOURCES runtime/util/json_util.cpp runtime/util/objc_json_serde.mm)
-
 # sdk sources
 set(SDK_SOURCES
     runtime/sdk/ETCoreMLModelAnalyzer.mm
@@ -111,11 +99,35 @@ set(PROTOBUF_SOURCES
     runtime/sdk/format/WordTagger.pb.cc
 )
 
+# CoreML util
+add_library(coreml_util)
+target_sources(coreml_util
+  PRIVATE runtime/util/json_util.cpp
+          runtime/util/objc_json_serde.mm
+)
+target_include_directories(coreml_util
+  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
+)
+
+# CoreML inmemoryfs
+add_library(coreml_inmemoryfs)
+target_sources(coreml_inmemoryfs
+  PRIVATE runtime/inmemoryfs/inmemory_filesystem.cpp
+          runtime/inmemoryfs/inmemory_filesystem_utils.mm
+          runtime/inmemoryfs/memory_buffer.cpp
+          runtime/inmemoryfs/memory_stream.cpp
+          runtime/inmemoryfs/reversed_memory_stream.cpp
+)
+target_include_directories(coreml_inmemoryfs
+  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs
+)
+target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util)
+
 # Define the delegate library
 add_library(coremldelegate)
-target_sources(
-  coremldelegate PRIVATE ${INMEMORYFS_SOURCES} ${KVSTORE_SOURCES}
-                         ${DELEGATE_SOURCES} ${UTIL_SOURCES}
+target_sources(coremldelegate
+  PRIVATE ${KVSTORE_SOURCES}
+          ${DELEGATE_SOURCES}
 )
 
 target_include_directories(
@@ -124,18 +136,14 @@ target_include_directories(
 target_include_directories(
   coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/kvstore
 )
-target_include_directories(
-  coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs
-)
 target_include_directories(
   coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/delegate
 )
-target_include_directories(
-  coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
-)
 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)