File tree Expand file tree Collapse file tree 4 files changed +117
-215
lines changed
Expand file tree Collapse file tree 4 files changed +117
-215
lines changed Original file line number Diff line number Diff line change 44# This source code is licensed under the BSD-style license found in the
55# LICENSE file in the root directory of this source tree.
66
7- set (
8- _schema_files
9- bundled_program_schema.fbs
10- scalar_type.fbs
11- )
7+ set (_schema_files bundled_program_schema.fbs scalar_type.fbs)
128
139set (_schema_outputs)
1410foreach (schema_file ${_schema_files} )
15- list (APPEND _bundled_program_schema__srcs "${CMAKE_CURRENT_SOURCE_DIR} /schema/${schema_file} " )
11+ list (APPEND _bundled_program_schema__srcs
12+ "${CMAKE_CURRENT_SOURCE_DIR} /schema/${schema_file} "
13+ )
1614
1715 string (REGEX REPLACE "[.]fbs$" "_generated.h" generated "${schema_file} " )
18- list (APPEND _schema_outputs "${DEVTOOLS_INCLUDE_DIR} /executorch/devtools/bundled_program/schema/${generated} " )
16+ list (
17+ APPEND
18+ _schema_outputs
19+ "${DEVTOOLS_INCLUDE_DIR} /executorch/devtools/bundled_program/schema/${generated} "
20+ )
1921endforeach ()
2022
2123file (MAKE_DIRECTORY ${DEVTOOLS_INCLUDE_DIR} /executorch/devtools/bundled_program)
@@ -32,20 +34,13 @@ add_custom_command(
3234)
3335
3436add_library (
35- bundled_program
36- ${_schema_outputs}
37- ${CMAKE_CURRENT_SOURCE_DIR} /bundled_program.cpp
38- )
39- target_link_libraries (
40- bundled_program
41- PUBLIC
42- executorch
37+ bundled_program ${_schema_outputs}
38+ ${CMAKE_CURRENT_SOURCE_DIR} /bundled_program.cpp
4339)
40+ target_link_libraries (bundled_program PUBLIC executorch)
4441target_include_directories (
45- bundled_program
46- PUBLIC
47- ${DEVTOOLS_INCLUDE_DIR}
48- ${PROJECT_SOURCE_DIR} /third-party/flatbuffers/include
42+ bundled_program PUBLIC ${DEVTOOLS_INCLUDE_DIR}
43+ ${PROJECT_SOURCE_DIR} /third-party/flatbuffers/include
4944)
5045
5146install (
Original file line number Diff line number Diff line change @@ -72,11 +72,12 @@ endif()
7272# size_test_all_optimized_ops: binary with optimized ops and no delegate backend
7373#
7474if (EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
75- add_executable (size_test_all_optimized_ops ${_size_test__srcs} )
76- target_link_options_shared_lib(optimized_native_cpu_ops_lib)
77- target_link_libraries (
78- size_test_all_optimized_ops executorch optimized_native_cpu_ops_lib)
79- if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
80- target_link_options_gc_sections(size_test_all_optimized_ops)
81- endif ()
75+ add_executable (size_test_all_optimized_ops ${_size_test__srcs} )
76+ target_link_options_shared_lib(optimized_native_cpu_ops_lib)
77+ target_link_libraries (
78+ size_test_all_optimized_ops executorch optimized_native_cpu_ops_lib
79+ )
80+ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
81+ target_link_options_gc_sections(size_test_all_optimized_ops)
82+ endif ()
8283endif ()
Original file line number Diff line number Diff line change @@ -150,7 +150,9 @@ if(TARGET coremldelegate)
150150endif ()
151151
152152if (TARGET etdump)
153- set_target_properties (etdump PROPERTIES INTERFACE_LINK_LIBRARIES "flatccrt;executorch" )
153+ set_target_properties (
154+ etdump PROPERTIES INTERFACE_LINK_LIBRARIES "flatccrt;executorch"
155+ )
154156endif ()
155157
156158if (TARGET optimized_native_cpu_ops_lib)
@@ -174,13 +176,11 @@ if(TARGET extension_threadpool)
174176endif ()
175177
176178set (shared_lib_list
177- # executorch -- size tests fail due to regression if we include this and I'm not sure it's needed.
178- optimized_native_cpu_ops_lib
179- portable_ops_lib
180- quantized_ops_lib
181- xnnpack_backend
182- vulkan_backend
183- quantized_ops_aot_lib)
179+ # executorch -- size tests fail due to regression if we include this and I'm
180+ # not sure it's needed.
181+ optimized_native_cpu_ops_lib portable_ops_lib quantized_ops_lib
182+ xnnpack_backend vulkan_backend quantized_ops_aot_lib
183+ )
184184foreach (lib ${shared_lib_list} )
185185 if (TARGET ${lib} )
186186 target_link_options_shared_lib(${lib} )
You can’t perform that action at this time.
0 commit comments