diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2021-08-30 19:48:22 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-01 00:07:00 +0000 |
| commit | af73d3a5e7fa1c7fb97f525805a16e713e83fefe (patch) | |
| tree | e4fb989ecb07768cf9649060572e171a80375c56 | |
| parent | f2cd04584ae62ccdcff3585c7b7b9f1e294eca1b (diff) | |
wasm: fail when configuring for wasm and EMSDK is not found
Change-Id: Ic7fb933d8c2b42c3ba84a3b5a6c89a808d971bd1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 375c7c47ff29d40ace4b489738510fac96997c21)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/QtAutoDetect.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index ffa6028320..5c6cba89ae 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -17,7 +17,12 @@ function(qt_internal_ensure_static_qt_config) endfunction() function(qt_auto_detect_wasm) - if("${QT_QMAKE_TARGET_MKSPEC}" STREQUAL "wasm-emscripten" AND DEFINED ENV{EMSDK}) + if("${QT_QMAKE_TARGET_MKSPEC}" STREQUAL "wasm-emscripten") + if (NOT DEFINED ENV{EMSDK}) + message(FATAL_ERROR + "Can't find EMSDK! Make sure EMSDK environment variable " + "is available and emcc is in your path.") + endif() if(NOT DEFINED QT_AUTODETECT_WASM) # detect EMSCRIPTEN_ROOT path file(READ "$ENV{EMSDK}/.emscripten" ver) |