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

wasm: refactor cmake finalizers

Browse Source 
Avoid duplication and move finalizer code to a new
function "_qt_internal_finalize_wasm_app", which can
be called from the add_executable functions.

Change-Id: I4859a3999725ebf61a496d78665b6a259dfeb0f5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
(cherry picked from commit 2116c62256bbf1bc3d516430509a93177572d86f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Morten Sørvig 2024-06-12 11:46:04 +02:00 committed by Qt Cherry-pick Bot
parent c4106cee7c
commit 72dad27a25
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/QtExecutableHelpers.cmake
View File

@ -34,6 +34,9 @@ function(qt_internal_add_executable name)
if(ANDROID)
_qt_internal_android_executable_finalizer(${name})
endif()
if(WASM)
qt_internal_wasm_add_finalizers(${name})
endif()
if(arg_QT_APP AND QT_FEATURE_debug_and_release AND CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0")
set_property(TARGET "${name}"
@ -148,10 +151,6 @@ function(qt_internal_add_executable name)
qt_internal_set_exceptions_flags("${name}" ${arg_EXCEPTIONS})
if(WASM)
qt_internal_wasm_add_finalizers("${name}")
endif()
# Check if target needs to be excluded from all target. Also affects qt_install.
# Set by qt_exclude_tool_directories_from_default_target.
set(exclude_from_all FALSE)

7
cmake/QtWasmHelpers.cmake
View File

@ -113,10 +113,5 @@ function (qt_internal_setup_wasm_target_properties wasmTarget)
endfunction()
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_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_set_wasm_embind_option ${target})
qt_add_list_file_finalizer(_qt_internal_finalize_wasm_app ${target})
endfunction()

5
src/corelib/Qt6CoreMacros.cmake
View File

@ -728,10 +728,7 @@ function(_qt_internal_finalize_executable target)
endif()
if(EMSCRIPTEN)
_qt_internal_wasm_add_target_helpers("${target}")
_qt_internal_add_wasm_extra_exported_methods("${target}")
_qt_internal_set_wasm_export_name("${target}")
_qt_internal_set_wasm_embind_option("${target}")
_qt_internal_finalize_wasm_app("${target}")
endif()
if(APPLE)

8
src/corelib/Qt6WasmMacros.cmake
View File

@ -143,3 +143,11 @@ endfunction()
function(_qt_internal_set_wasm_embind_option target)
target_link_libraries("${target}" PRIVATE embind)
endfunction()
function(_qt_internal_finalize_wasm_app target)
_qt_internal_set_wasm_export_name("${target}")
_qt_internal_add_wasm_extra_exported_methods("${target}")
_qt_internal_wasm_add_target_helpers("${target}")
_qt_internal_set_wasm_embind_option("${target}")
endfunction()