1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: do not set autodetect wasm true until we actually detect

Browse Source 
Change-Id: Ib6bdd3d5ed7dab108b636284ee564d14dbc2d5c8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Lorn Potter 2021-04-27 06:36:05 +10:00
parent e439fab4be
commit cdad78a4a4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtAutoDetect.cmake
View File

@ -9,7 +9,6 @@
function(qt_auto_detect_wasm) 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" AND DEFINED ENV{EMSDK})
if(NOT DEFINED QT_AUTODETECT_WASM) if(NOT DEFINED QT_AUTODETECT_WASM)
set(QT_AUTODETECT_WASM TRUE CACHE BOOL "")
# detect EMSCRIPTEN_ROOT path # detect EMSCRIPTEN_ROOT path
file(READ "$ENV{EMSDK}/.emscripten" ver) file(READ "$ENV{EMSDK}/.emscripten" ver)
string(REGEX MATCH "EMSCRIPTEN_ROOT.*$" EMROOT "${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. " message(FATAL_ERROR "Cannot find the toolchain file Emscripten.cmake. "
"Please specify the toolchain file with -DCMAKE_TOOLCHAIN_FILE=<file>.") "Please specify the toolchain file with -DCMAKE_TOOLCHAIN_FILE=<file>.")
endif() endif()
set(QT_AUTODETECT_WASM TRUE CACHE BOOL "")
if(NOT DEFINED BUILD_SHARED_LIBS) if(NOT DEFINED BUILD_SHARED_LIBS)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Qt statically or dynamically" FORCE) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Qt statically or dynamically" FORCE)