Skip to content

Commit 47f4082

Browse files
committed
[CMake] Avoid extension_module have dupe flat_tensor cpp
Currently, _extension_module__srcs has srcs from flat_tensor. This is bad. ``` set(_extension_module__srcs extension/flat_tensor/flat_tensor_data_map.cpp extension/flat_tensor/serialize/flat_tensor_header.cpp extension/module/module.cpp ) ``` We need to update deps. We need to export extension_flat_tensor to install directory.
1 parent e60958a commit 47f4082

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

extension/android/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ list(
7272
link_libraries
7373
executorch
7474
extension_data_loader
75+
extension_flat_tensor
7576
extension_module
7677
extension_runner_util
7778
extension_tensor

extension/flat_tensor/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ endif()
1818

1919
list(TRANSFORM _extension_flat_tensor__srcs PREPEND "${EXECUTORCH_ROOT}/")
2020
add_library(extension_flat_tensor ${_extension_flat_tensor__srcs})
21-
target_link_libraries(extension_flat_tensor executorch extension_data_loader)
21+
target_link_libraries(extension_flat_tensor executorch_core)
2222
target_include_directories(
2323
extension_flat_tensor
2424
PUBLIC ${EXECUTORCH_ROOT}/..

tools/cmake/cmake_deps.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ filters = [
198198
deps = [
199199
"extension_flat_tensor_schema",
200200
"executorch_core",
201-
"executorch",
202201
]
203202

204203
[targets.extension_module]
@@ -209,9 +208,9 @@ filters = [
209208
".cpp$",
210209
]
211210
deps = [
212-
"executorch",
213211
"executorch_core",
214212
"extension_data_loader",
213+
"extension_flat_tensor",
215214
]
216215

217216
[targets.extension_runner_util]

tools/cmake/executorch-config.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ set(lib_list
6666
etdump
6767
bundled_program
6868
extension_data_loader
69+
extension_flat_tensor
6970
${FLATCCRT_LIB}
7071
coreml_util
7172
coreml_inmemoryfs

0 commit comments

Comments
 (0)