From e38807996f19d09a8bcd70870206bd44e245a0e9 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Thu, 1 Sep 2022 17:29:44 +0200 Subject: [PATCH] Add wasm target helpers in a finalizer when adding executable This way it is able to pick up all of the properties assigned to it before finalization. Change-Id: I9da635f8620859a669c4e4d589fff56a3ce42ab9 Reviewed-by: Alexandru Croitor --- cmake/QtExecutableHelpers.cmake | 1 - cmake/QtWasmHelpers.cmake | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index ee5e7a1f163..78e0c671af9 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -140,7 +140,6 @@ function(qt_internal_add_executable name) if(WASM) qt_internal_wasm_add_finalizers("${name}") - _qt_internal_wasm_add_target_helpers("${name}") endif() # Check if target needs to be excluded from all target. Also affects qt_install. diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake index 07de3751ef8..b1d0c5e877b 100644 --- a/cmake/QtWasmHelpers.cmake +++ b/cmake/QtWasmHelpers.cmake @@ -104,6 +104,7 @@ endfunction() function(qt_internal_wasm_add_finalizers 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}) endfunction()