WIP: cmake: use patched version of cxx-qt-cmake

KDAB · Nov 18, 2024 · 19bd854 · 19bd854
1 parent 4bddf8e
commit 19bd854
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Build warnings due to unused unsafe blocks since CXX 1.0.130
+- Build failures with WASM due to `cc` crate setting `-fno-exceptions` since 1.2.0
 
 ## [0.7.0](https://github.com/KDAB/cxx-qt/compare/v0.6.1...v0.7.0) - 2024-10-30
 

diff --git a/book/src/concepts/wasm-builds.md b/book/src/concepts/wasm-builds.md
@@ -190,3 +190,12 @@ error[E0433]: failed to resolve: use of undeclared type `IovLen`
 `socket2` is a dependency of `async-io`, which is a dependency of `async-std`.
 
 There is discussion around supporting wasm in the GitHub repository for `async-std`, and the progress is being tracked [here](https://github.com/async-rs/async-std/issues/220).
+
+### Cannot use throw / try catch with exceptions disabled
+
+CXX and CXX-Qt can generate code that attempts to use exceptions but these are disabled
+for most WASM platforms.
+
+The cmake-qt-cmake builder will attempt to set a define of `RUST_CXX_NO_EXCEPTIONS` which should
+causes the code not to be compiled. But if this doesn't work try adding `-DRUST_CXX_NO_EXCEPTIONS`
+to a `CXXFLAGS` enviornment variable while building.
diff --git a/examples/demo_threading/CMakeLists.txt b/examples/demo_threading/CMakeLists.txt
@@ -46,7 +46,8 @@ if(NOT CxxQt_FOUND)
     FetchContent_Declare(
         CxxQt
         GIT_REPOSITORY https://github.com/kdab/cxx-qt-cmake.git
-        GIT_TAG main
+        GIT_TAG wasm-set-cxxflags
+        # GIT_TAG main
     )
 
     FetchContent_MakeAvailable(CxxQt)

diff --git a/examples/qml_features/CMakeLists.txt b/examples/qml_features/CMakeLists.txt
@@ -46,7 +46,8 @@ if(NOT CxxQt_FOUND)
     FetchContent_Declare(
         CxxQt
         GIT_REPOSITORY https://github.com/kdab/cxx-qt-cmake.git
-        GIT_TAG main
+        GIT_TAG wasm-set-cxxflags
+        # GIT_TAG main
     )
 
     FetchContent_MakeAvailable(CxxQt)

diff --git a/examples/qml_minimal/CMakeLists.txt b/examples/qml_minimal/CMakeLists.txt
@@ -55,7 +55,8 @@ if(NOT CxxQt_FOUND)
         CxxQt
         GIT_REPOSITORY https://github.com/kdab/cxx-qt-cmake.git
         # ANCHOR_END: book_cmake_find_cxx_qt_start
-        GIT_TAG main
+        GIT_TAG wasm-set-cxxflags
+        # GIT_TAG main
         # ANCHOR: book_cmake_find_cxx_qt_end
     )
 

diff --git a/tests/basic_cxx_only/CMakeLists.txt b/tests/basic_cxx_only/CMakeLists.txt
@@ -36,7 +36,8 @@ if(NOT CxxQt_FOUND)
     FetchContent_Declare(
         CxxQt
         GIT_REPOSITORY https://github.com/kdab/cxx-qt-cmake.git
-        GIT_TAG main
+        GIT_TAG wasm-set-cxxflags
+        # GIT_TAG main
     )
 
     FetchContent_MakeAvailable(CxxQt)

diff --git a/tests/basic_cxx_qt/CMakeLists.txt b/tests/basic_cxx_qt/CMakeLists.txt
@@ -36,7 +36,8 @@ if(NOT CxxQt_FOUND)
     FetchContent_Declare(
         CxxQt
         GIT_REPOSITORY https://github.com/kdab/cxx-qt-cmake.git
-        GIT_TAG main
+        GIT_TAG wasm-set-cxxflags
+        # GIT_TAG main
     )
 
     FetchContent_MakeAvailable(CxxQt)

diff --git a/tests/qt_types_standalone/CMakeLists.txt b/tests/qt_types_standalone/CMakeLists.txt
@@ -36,7 +36,8 @@ if(NOT CxxQt_FOUND)
     FetchContent_Declare(
         CxxQt
         GIT_REPOSITORY https://github.com/kdab/cxx-qt-cmake.git
-        GIT_TAG main
+        GIT_TAG wasm-set-cxxflags
+        # GIT_TAG main
     )
 
     FetchContent_MakeAvailable(CxxQt)