try to disable exceptions for Catch2

improve check for WASM in conanfile

Author: canepat

cmake/toolchain/wasi.cmake

@@ -17,8 +17,6 @@
 set(CMAKE_C_COMPILER /opt/wasi-sdk/bin/clang)
 set(CMAKE_CXX_COMPILER /opt/wasi-sdk/bin/clang++)
 
-set(CMAKE_EXE_LINKER_FLAGS "-Xlinker -v -v")
-
-add_compile_definitions(CATCH_CONFIG_NO_POSIX_SIGNALS JSON_HAS_FILESYSTEM=0)
+add_compile_definitions(CATCH_CONFIG_NO_POSIX_SIGNALS CATCH_CONFIG_DISABLE_EXCEPTIONS JSON_HAS_FILESYSTEM=0)
 
 include(${CMAKE_CURRENT_LIST_DIR}/cxx20.cmake)

conanfile.py

@@ -63,7 +63,7 @@ def configure(self):
             self.options['mimalloc'].override = True
 
         # Disable Catch2 version 3.x.x signaling handling on WASM
-        if self.settings.os == 'Emscripten':
+        if self.settings.arch == 'wasm':
             self.options['catch2'].no_posix_signals = True
 
         self.options['boost'].asio_no_deprecated = True