diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2021-04-27 06:36:05 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2021-04-27 09:49:34 +1000 |
| commit | cdad78a4a46412051b7251898c4edc9f4a23167c (patch) | |
| tree | 1262b435d8c7b9728a50af660033d9d0b619860c /cmake | |
| parent | e439fab4be308a2a5e0beb1b3ff6eef35798b5d7 (diff) | |
wasm: do not set autodetect wasm true until we actually detect
Change-Id: Ib6bdd3d5ed7dab108b636284ee564d14dbc2d5c8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtAutoDetect.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 0337637216..8c2baeac0e 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -9,7 +9,6 @@ function(qt_auto_detect_wasm) if("${QT_QMAKE_TARGET_MKSPEC}" STREQUAL "wasm-emscripten" AND DEFINED ENV{EMSDK}) if(NOT DEFINED QT_AUTODETECT_WASM) - set(QT_AUTODETECT_WASM TRUE CACHE BOOL "") # detect EMSCRIPTEN_ROOT path file(READ "$ENV{EMSDK}/.emscripten" ver) string(REGEX MATCH "EMSCRIPTEN_ROOT.*$" EMROOT "${ver}") @@ -48,6 +47,7 @@ function(qt_auto_detect_wasm) message(FATAL_ERROR "Cannot find the toolchain file Emscripten.cmake. " "Please specify the toolchain file with -DCMAKE_TOOLCHAIN_FILE=<file>.") endif() + set(QT_AUTODETECT_WASM TRUE CACHE BOOL "") if(NOT DEFINED BUILD_SHARED_LIBS) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Qt statically or dynamically" FORCE) |