From 3cbbf9dcaed4db1d7d2c8014223514e6c06287c2 Mon Sep 17 00:00:00 2001 From: daquexian Date: Wed, 15 Jun 2022 06:18:11 +0800 Subject: [PATCH] Fix wasm static lib in sub-project (#11671) * wasm_static_lib_global Signed-off-by: daquexian * make wasm static lib global Signed-off-by: daquexian * fix the property Signed-off-by: daquexian * add code missing after merge Signed-off-by: daquexian --- cmake/onnxruntime_webassembly.cmake | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cmake/onnxruntime_webassembly.cmake b/cmake/onnxruntime_webassembly.cmake index df493f3d8d..ec6212ff1b 100644 --- a/cmake/onnxruntime_webassembly.cmake +++ b/cmake/onnxruntime_webassembly.cmake @@ -71,12 +71,15 @@ function(bundle_static_library bundled_target_name) add_dependencies(bundling_target ${target_name}) endforeach() - add_library(${bundled_target_name} STATIC IMPORTED) + add_library(${bundled_target_name} STATIC IMPORTED GLOBAL) + set_target_properties(${bundled_target_name} + PROPERTIES + IMPORTED_LOCATION ${bundled_target_full_name}) foreach(target_name IN ITEMS ${ARGN}) - set_target_properties(${bundled_target_name} - PROPERTIES - IMPORTED_LOCATION ${bundled_target_full_name} - INTERFACE_INCLUDE_DIRECTORIES $) + set_property(TARGET ${bundled_target_name} APPEND + PROPERTY INTERFACE_INCLUDE_DIRECTORIES $) + set_property(TARGET ${bundled_target_name} APPEND + PROPERTY INTERFACE_COMPILE_DEFINITIONS $) endforeach() add_dependencies(${bundled_target_name} bundling_target) endfunction()