Skip to content

Commit 1d5088c

Browse files
committed
Prefix target_link_options_shared_lib with ExecuTorch
I think we are getting build failures in the following PR (e.g., in QNN) because QNN has a copy/paste of this function that I changed to work differently. If this works out, we should namespace all our functions. ghstack-source-id: c16fc23 ghstack-comment-id: 3095006055 Pull-Request: #12667
1 parent 0453228 commit 1d5088c

File tree

22 files changed

+66
-66
lines changed

22 files changed

+66
-66
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ target_link_libraries(executorch PRIVATE executorch_core)
416416
target_include_directories(executorch PUBLIC ${_common_include_directories})
417417
target_compile_definitions(executorch PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
418418
target_compile_options(executorch PUBLIC ${_common_compile_options})
419-
target_link_options_shared_lib(executorch)
419+
executorch_target_link_options_shared_lib(executorch)
420420

421421
#
422422
# portable_ops_lib: A library to register core ATen ops using portable kernels,
@@ -690,7 +690,7 @@ endif()
690690

691691
if(EXECUTORCH_BUILD_KERNELS_QUANTIZED)
692692
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/kernels/quantized)
693-
target_link_options_shared_lib(quantized_ops_lib)
693+
executorch_target_link_options_shared_lib(quantized_ops_lib)
694694
endif()
695695

696696
if(EXECUTORCH_BUILD_EXECUTOR_RUNNER)

backends/apple/coreml/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ if(APPLE)
199199
${CMAKE_CURRENT_SOURCE_DIR}/third-party/coremltools/deps/protobuf/cmake
200200
)
201201

202-
target_link_options_shared_lib(libprotobuf-lite)
202+
executorch_target_link_options_shared_lib(libprotobuf-lite)
203203
target_link_libraries(coremldelegate PRIVATE libprotobuf-lite)
204204
endif()
205205

@@ -210,7 +210,7 @@ if(APPLE)
210210
${FOUNDATION_FRAMEWORK} ${SQLITE_LIBRARY}
211211
)
212212

213-
target_link_options_shared_lib(coremldelegate)
213+
executorch_target_link_options_shared_lib(coremldelegate)
214214

215215
if(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER)
216216
target_link_libraries(

backends/apple/mps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ target_link_libraries(
7070
${MPS_FRAMEWORK} ${MPS_GRAPH_FRAMEWORK}
7171
)
7272

73-
target_link_options_shared_lib(mpsdelegate)
73+
executorch_target_link_options_shared_lib(mpsdelegate)
7474
target_compile_options(mpsdelegate PUBLIC ${_common_compile_options})
7575
target_compile_options(mpsdelegate PRIVATE "-fno-objc-arc")
7676

backends/cadence/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ if(EXECUTORCH_CADENCE_CPU_RUNNER)
3535
# Find prebuilt libraries. executorch package should contain portable_ops_lib,
3636
# etdump, bundled_program.
3737
find_package(executorch CONFIG REQUIRED)
38-
target_link_options_shared_lib(executorch)
39-
target_link_options_shared_lib(portable_ops_lib)
38+
executorch_target_link_options_shared_lib(executorch)
39+
executorch_target_link_options_shared_lib(portable_ops_lib)
4040

4141
target_include_directories(executorch INTERFACE ${_common_include_directories})
4242

backends/mediatek/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ target_sources(
4040
${CMAKE_CURRENT_LIST_DIR}/runtime/NeuronExecutor.cpp
4141
${CMAKE_CURRENT_LIST_DIR}/runtime/NeuronBufferAllocator.cpp
4242
)
43-
target_link_options_shared_lib(neuron_backend)
43+
executorch_target_link_options_shared_lib(neuron_backend)
4444

4545
install(TARGETS neuron_backend DESTINATION lib)

backends/openvino/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ target_link_libraries(openvino_backend PRIVATE openvino::runtime executorch_core
4646
# Add source files for OpenVINO backend
4747
target_sources(openvino_backend PRIVATE ${CMAKE_CURRENT_LIST_DIR}/runtime/OpenvinoBackend.cpp)
4848

49-
target_link_options_shared_lib(openvino_backend)
49+
executorch_target_link_options_shared_lib(openvino_backend)
5050

5151
if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
5252
# Build executor runner binary for openvino backend

backends/qualcomm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ target_link_libraries(
209209
#
210210
# add linker option
211211
#
212-
target_link_options_shared_lib(qnn_executorch_backend)
212+
executorch_target_link_options_shared_lib(qnn_executorch_backend)
213213

214214
#
215215
# add sources

backends/xnnpack/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ target_include_directories(
116116
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third-party/cpuinfo/include
117117
)
118118
target_compile_options(xnnpack_backend PUBLIC ${_common_compile_options})
119-
target_link_options_shared_lib(xnnpack_backend)
119+
executorch_target_link_options_shared_lib(xnnpack_backend)
120120

121121
install(
122122
TARGETS xnnpack_backend

docs/source/kernel-library-custom-aten-kernel.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Link it into ExecuTorch runtime: In our `CMakeLists.txt` that builds the binary/
266266
Here's an example to do it:
267267

268268
```cmake
269-
# For target_link_options_shared_lib
269+
# For executorch_target_link_options_shared_lib
270270
include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
271271
272272
# Add a custom op library
@@ -282,7 +282,7 @@ target_link_libraries(custom_op_lib PUBLIC executorch)
282282
add_executable(custom_op_runner PUBLIC main.cpp)
283283
284284
# Link this library with --whole-archive !! IMPORTANT !! this is to avoid the operators being stripped by linker
285-
target_link_options_shared_lib(custom_op_lib)
285+
executorch_target_link_options_shared_lib(custom_op_lib)
286286
287287
# Link custom op lib
288288
target_link_libraries(custom_op_runner PUBLIC custom_op_lib)

examples/devtools/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ set(_common_include_directories ${EXECUTORCH_ROOT}/..)
3737
# Find prebuilt libraries. executorch package should contain portable_ops_lib,
3838
# etdump, bundled_program.
3939
find_package(executorch CONFIG REQUIRED)
40-
target_link_options_shared_lib(executorch)
41-
target_link_options_shared_lib(portable_ops_lib)
40+
executorch_target_link_options_shared_lib(executorch)
41+
executorch_target_link_options_shared_lib(portable_ops_lib)
4242

4343
target_include_directories(executorch INTERFACE ${_common_include_directories})
4444

0 commit comments

Comments
 (0)