From cdad78a4a46412051b7251898c4edc9f4a23167c Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 27 Apr 2021 06:36:05 +1000 Subject: wasm: do not set autodetect wasm true until we actually detect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib6bdd3d5ed7dab108b636284ee564d14dbc2d5c8 Reviewed-by: Tor Arne Vestbø --- cmake/QtAutoDetect.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') 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=.") 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) -- cgit v1.2.3