1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: set embind option in executable finalizer

Browse Source 
This prevents setting it more than once, which will
on recent Emscripten versions cause 'duplicate symbol'
linker errors.

Pick-to: 6.8
Change-Id: Ie6c2ede0569271cf3a02fc993b14bbf27f69ff57
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
This commit is contained in:
Morten Sørvig 2024-06-11 23:32:06 +02:00
parent 29115a7496
commit 320cb68ce5
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtWasmHelpers.cmake
View File

@ -11,8 +11,6 @@ function (qt_internal_setup_wasm_target_properties wasmTarget)
"SHELL:-s WASM_BIGINT=1" "SHELL:-s WASM_BIGINT=1"
"SHELL:-s STACK_SIZE=5MB") "SHELL:-s STACK_SIZE=5MB")
target_link_libraries("${wasmTarget}" INTERFACE embind)
## wasm64 ## wasm64
if (WASM64) if (WASM64)
target_compile_options("${wasmTarget}" INTERFACE "SHELL:-s MEMORY64=1" ) target_compile_options("${wasmTarget}" INTERFACE "SHELL:-s MEMORY64=1" )
@ -118,6 +116,7 @@ function(qt_internal_wasm_add_finalizers target)
qt_add_list_file_finalizer(_qt_internal_set_wasm_export_name ${target}) qt_add_list_file_finalizer(_qt_internal_set_wasm_export_name ${target})
qt_add_list_file_finalizer(_qt_internal_add_wasm_extra_exported_methods ${target}) qt_add_list_file_finalizer(_qt_internal_add_wasm_extra_exported_methods ${target})
qt_add_list_file_finalizer(_qt_internal_wasm_add_target_helpers ${target}) qt_add_list_file_finalizer(_qt_internal_wasm_add_target_helpers ${target})
qt_add_list_file_finalizer(_qt_internal_set_wasm_embind_option ${target})
endfunction() endfunction()

1
src/corelib/Qt6CoreMacros.cmake
View File

@ -731,6 +731,7 @@ function(_qt_internal_finalize_executable target)
_qt_internal_wasm_add_target_helpers("${target}") _qt_internal_wasm_add_target_helpers("${target}")
_qt_internal_add_wasm_extra_exported_methods("${target}") _qt_internal_add_wasm_extra_exported_methods("${target}")
_qt_internal_set_wasm_export_name("${target}") _qt_internal_set_wasm_export_name("${target}")
_qt_internal_set_wasm_embind_option("${target}")
endif() endif()
if(APPLE) if(APPLE)

4
src/corelib/Qt6WasmMacros.cmake
View File

@ -143,3 +143,7 @@ function(_qt_internal_wasm_export_name_for_target out target)
endif() endif()
endif() endif()
endfunction() endfunction()
function(_qt_internal_set_wasm_embind_option target)
target_link_libraries("${target}" PRIVATE embind)
endfunction()