diff options
Diffstat (limited to 'cmake/QtPublicWasmToolchainHelpers.cmake')
| -rw-r--r-- | cmake/QtPublicWasmToolchainHelpers.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/QtPublicWasmToolchainHelpers.cmake b/cmake/QtPublicWasmToolchainHelpers.cmake index 31f6b5aca5..a8994520e2 100644 --- a/cmake/QtPublicWasmToolchainHelpers.cmake +++ b/cmake/QtPublicWasmToolchainHelpers.cmake @@ -83,8 +83,6 @@ function(__qt_internal_get_qt_build_emsdk_version out_var) file(READ "${WASM_BUILD_DIR}/src/corelib/global/qconfig.h" ver) elseif(EXISTS "${WASM_BUILD_DIR}/include/QtCore/qconfig.h") file(READ "${WASM_BUILD_DIR}/include/QtCore/qconfig.h" ver) - else() - message("qconfig.h not found, unable to determine Qt build Emscripten version") endif() if (ver) string(REGEX MATCH "#define QT_EMCC_VERSION.\"[0-9]+\\.[0-9]+\\.[0-9]+\"" emOutput ${ver}) @@ -99,7 +97,7 @@ function(_qt_test_emscripten_version) __qt_internal_query_emsdk_version("${emroot_path}" TRUE current_emsdk_ver) __qt_internal_get_qt_build_emsdk_version(qt_build_emcc_version) - if(NOT "${qt_build_emcc_version}" STREQUAL "${current_emsdk_ver}") + if(NOT "${qt_build_emcc_version}" STREQUAL "" AND NOT "${qt_build_emcc_version}" STREQUAL "${current_emsdk_ver}") message("Qt Wasm built with Emscripten version: ${qt_build_emcc_version}") message("You are using Emscripten version: ${current_emsdk_ver}") message("The recommended version of Emscripten for this Qt is: ${_recommended_emver}") |