Skip to content

Commit db64c4d

Browse files
committed
address comments
1 parent 3e51425 commit db64c4d

File tree

1 file changed

+28
-17
lines changed

1 file changed

+28
-17
lines changed

backends/apple/coreml/CMakeLists.txt

+28-17
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,31 @@ set(PROTOBUF_SOURCES
118118
runtime/sdk/format/WordTagger.pb.cc
119119
)
120120

121+
find_library(FOUNDATION_FRAMEWORK Foundation)
122+
121123
# CoreML util
122-
add_library(coreml_util)
123-
target_sources(coreml_util PRIVATE ${UTIL_SOURCES})
124-
target_include_directories(coreml_util
125-
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
124+
add_library(coreml_util ${UTIL_SOURCES})
125+
target_include_directories(coreml_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util)
126+
target_link_libraries(coreml_util PRIVATE ${FOUNDATION_FRAMEWORK})
127+
128+
install(
129+
TARGETS coreml_util
130+
DESTINATION lib
131+
INCLUDES
132+
DESTINATION ${_common_include_directories}
126133
)
127134

128135
# CoreML inmemoryfs
129-
add_library(coreml_inmemoryfs)
130-
target_sources(coreml_inmemoryfs PRIVATE ${INMEMORYFS_SOURCES})
131-
target_include_directories(coreml_inmemoryfs
132-
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs
136+
add_library(coreml_inmemoryfs ${INMEMORYFS_SOURCES})
137+
target_include_directories(coreml_inmemoryfs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs)
138+
target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util ${FOUNDATION_FRAMEWORK})
139+
140+
install(
141+
TARGETS coreml_inmemoryfs
142+
DESTINATION lib
143+
INCLUDES
144+
DESTINATION ${_common_include_directories}
133145
)
134-
target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util)
135146

136147
# Define the delegate library
137148
add_library(coremldelegate)
@@ -149,9 +160,6 @@ target_include_directories(
149160
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
150161
target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/runtime/core/portable_type/c10)
151162
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
152-
target_link_libraries(coremldelegate PRIVATE coreml_util)
153-
target_link_libraries(coremldelegate PRIVATE coreml_inmemoryfs)
154-
target_link_libraries(coremldelegate PRIVATE executorch_core)
155163

156164
if(EXECUTORCH_BUILD_DEVTOOLS)
157165
target_sources(coremldelegate PRIVATE ${SDK_SOURCES} ${PROTOBUF_SOURCES})
@@ -171,13 +179,17 @@ endif()
171179

172180
find_library(ACCELERATE_FRAMEWORK Accelerate)
173181
find_library(COREML_FRAMEWORK CoreML)
174-
find_library(FOUNDATION_FRAMEWORK Foundation)
175182
find_library(SQLITE_LIBRARY sqlite3)
176183

177184
target_link_libraries(
178185
coremldelegate
179-
PRIVATE executorch_core ${ACCELERATE_FRAMEWORK} ${COREML_FRAMEWORK}
180-
${FOUNDATION_FRAMEWORK} ${SQLITE_LIBRARY}
186+
PUBLIC coreml_util
187+
coreml_inmemoryfs
188+
PRIVATE executorch_core
189+
${ACCELERATE_FRAMEWORK}
190+
${COREML_FRAMEWORK}
191+
${FOUNDATION_FRAMEWORK}
192+
${SQLITE_LIBRARY}
181193
)
182194

183195
target_link_options_shared_lib(coremldelegate)
@@ -229,6 +241,5 @@ if(EXECUTORCH_BUILD_COREML)
229241
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
230242
target_compile_options(executorchcoreml PRIVATE -g)
231243
endif()
232-
target_link_libraries(executorchcoreml PRIVATE coreml_util)
233-
target_link_libraries(executorchcoreml PRIVATE coreml_inmemoryfs)
244+
target_link_libraries(executorchcoreml PRIVATE coreml_util coreml_inmemoryfs)
234245
endif()

0 commit comments

Comments
 (0)