diff options
| -rw-r--r-- | cmake/QtPublicWasmToolchainHelpers.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmake/QtPublicWasmToolchainHelpers.cmake b/cmake/QtPublicWasmToolchainHelpers.cmake index 433b29a9de..3ad9424848 100644 --- a/cmake/QtPublicWasmToolchainHelpers.cmake +++ b/cmake/QtPublicWasmToolchainHelpers.cmake @@ -74,10 +74,15 @@ function(__qt_internal_show_error_no_emscripten_toolchain_file_found_when_using_ endfunction() function(__qt_internal_get_qt_build_emsdk_version out_var) - if(EXISTS "${QT6_INSTALL_PREFIX}/src/corelib/global/qconfig.h") - file(READ "${QT6_INSTALL_PREFIX}/src/corelib/global/qconfig.h" ver) + if(QT6_INSTALL_PREFIX) + set(WASM_BUILD_DIR "${QT6_INSTALL_PREFIX}") + elseif(QT_BUILD_DIR) + set(WASM_BUILD_DIR "${QT_BUILD_DIR}") + endif() + if(EXISTS "${WASM_BUILD_DIR}/src/corelib/global/qconfig.h") + file(READ "${WASM_BUILD_DIR}/src/corelib/global/qconfig.h" ver) else() - file(READ "${QT6_INSTALL_PREFIX}/include/QtCore/qconfig.h" ver) + file(READ "${WASM_BUILD_DIR}/include/QtCore/qconfig.h" ver) endif() string(REGEX MATCH "#define QT_EMCC_VERSION.\"[0-9]+\\.[0-9]+\\.[0-9]+\"" emOutput ${ver}) string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" build_emcc_version "${emOutput}") |