From fd6182246af81cd0f57005559a65ca97d3b8fa75 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 21 Nov 2024 06:22:13 +1000 Subject: [PATCH] wasm: Add warning and error when using not recommended emscripten MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will produce an error when configuring Qt with Emscripten version less than what is recommended version. It will produce only a warning when configuring using Emscripten version greater than recommended. Change-Id: I62016394e8e52657a5e1d78c4288866e83af2d28 Reviewed-by: Piotr Wierciński Reviewed-by: Even Oscar Andersen --- configure.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.cmake b/configure.cmake index db5619e8efa..dd93c4a4f59 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1460,9 +1460,15 @@ qt_configure_add_report_entry( CONDITION QT_FEATURE_thread AND WASM ) qt_configure_add_report_entry( - TYPE WARNING + TYPE ERROR MESSAGE "You should use the recommended Emscripten version ${QT_EMCC_RECOMMENDED_VERSION} with this Qt. You have ${EMCC_VERSION}." - CONDITION WASM AND NOT ${EMCC_VERSION} MATCHES ${QT_EMCC_RECOMMENDED_VERSION} + CONDITION WASM AND ${EMCC_VERSION} VERSION_LESS ${QT_EMCC_RECOMMENDED_VERSION} +) +qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "Using Emscripten version ${QT_EMCC_RECOMMENDED_VERSION} with this Qt + may have issues. You have ${EMCC_VERSION}." + CONDITION WASM AND ${EMCC_VERSION} VERSION_GREATER ${QT_EMCC_RECOMMENDED_VERSION} ) qt_configure_add_report_entry( TYPE WARNING