diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2022-12-21 14:22:59 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-12-28 15:57:58 +0000 |
| commit | 0f43a04de77a08fe5e0fd1e589af0486708b7bed (patch) | |
| tree | c3822b6b207427d4070712e95fc2469edb75e6fa /configure.cmake | |
| parent | 22c48a4e026556baa199b48403b921dce28d9a2a (diff) | |
wasm: fix up new configure options
Make options for enabling "simd128" and "exceptions" public:
-feature-wasm-simd128
-feature-wasm-exceptions
Make sure both appear in the config summary and feature
list. Move the exceptions code so that they are next to
each other in the cmake file.
Change-Id: I3975b56703f40f7ffff270754535bc2eb5bfe488
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit ce560d28c8b426d3cb797fa04e9e78d980fc8501)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/configure.cmake b/configure.cmake index 95995a558d..776299189b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -929,23 +929,26 @@ qt_feature("arm_crypto" PRIVATE qt_feature_definition("arm_crypto" "QT_COMPILER_SUPPORTS_AES" VALUE "1") qt_feature_config("arm_crypto" QMAKE_PRIVATE_CONFIG) -qt_feature("wasm_simd128" PRIVATE +qt_feature("wasm-simd128" PUBLIC LABEL "WebAssembly SIMD128" + PURPOSE "Enables WebAssembly SIMD" AUTODETECT OFF ) -qt_feature_definition("wasm_simd128" "QT_COMPILER_SUPPORTS_WASM_SIMD128" VALUE "1") -qt_feature_config("wasm_simd128" QMAKE_PRIVATE_CONFIG) +qt_feature_definition("wasm-simd128" "QT_COMPILER_SUPPORTS_WASM_SIMD128" VALUE "1") +qt_feature_config("wasm-simd128" QMAKE_PRIVATE_CONFIG) + +qt_feature("wasm-exceptions" PUBLIC + LABEL "WebAssembly Exceptions" + PURPOSE "Enables WebAssembly Exceptions" + AUTODETECT OFF +) +qt_feature_definition("wasm-exceptions" "QT_WASM_EXCEPTIONS" VALUE "1") +qt_feature_config("wasm-exceptions" QMAKE_PRIVATE_CONFIG) qt_feature("posix_fallocate" PRIVATE LABEL "POSIX fallocate()" CONDITION TEST_posix_fallocate ) -qt_feature("wasm_exceptions" PRIVATE - LABEL "WebAssembly exception handling" - AUTODETECT OFF -) -qt_feature_definition("wasm_exceptions" "QT_WASM_EXCEPTIONS" VALUE "1") -qt_feature_config("wasm_exceptions" QMAKE_PRIVATE_CONFIG) qt_feature("alloca_h" PRIVATE LABEL "alloca.h" CONDITION TEST_alloca_h @@ -1172,7 +1175,11 @@ qt_configure_add_summary_entry(ARGS "precompile_header") qt_configure_add_summary_entry(ARGS "ltcg") qt_configure_add_summary_entry(ARGS "intelcet") qt_configure_add_summary_entry( - ARGS "wasm_simd128" + ARGS "wasm-simd128" + CONDITION ( TEST_architecture_arch STREQUAL wasm ) +) +qt_configure_add_summary_entry( + ARGS "wasm-exceptions" CONDITION ( TEST_architecture_arch STREQUAL wasm ) ) qt_configure_add_summary_section(NAME "Target compiler supports") |