From c3c461d8eef816f246fb351411efe60fb04c06c3 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Wed, 13 Dec 2023 11:48:36 +0100 Subject: [PATCH] Allow space in emsdk path Changing from Native path, to CMake path resolves the broken execute_process call. Pick-to: 6.5 Fixes: QTBUG-120050 Change-Id: I6725d0efc215e4866677bf6a64e315752c3f2a1d Reviewed-by: Alexandru Croitor (cherry picked from commit 6b09b515367b2c293e3d8284f37a6120d2f83019) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 9dbc0673c7d84785ddb8b41b0d9ffd97fdffc3e7) --- cmake/QtPublicWasmToolchainHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtPublicWasmToolchainHelpers.cmake b/cmake/QtPublicWasmToolchainHelpers.cmake index 4ed223ed8ac..675203bb0d0 100644 --- a/cmake/QtPublicWasmToolchainHelpers.cmake +++ b/cmake/QtPublicWasmToolchainHelpers.cmake @@ -30,7 +30,7 @@ function(__qt_internal_query_emsdk_version emroot_path is_fatal out_var) set(EXECUTE_COMMANDPATH "$ENV{EMSDK}/${emroot_path}/emcc") endif() - file(TO_NATIVE_PATH "${EXECUTE_COMMANDPATH}" EXECUTE_COMMAND) + file(TO_CMAKE_PATH "${EXECUTE_COMMANDPATH}" EXECUTE_COMMAND) execute_process(COMMAND ${EXECUTE_COMMAND} --version OUTPUT_VARIABLE emOutput OUTPUT_STRIP_TRAILING_WHITESPACE