WIP: test MSVC crash workaround

rgriebl · Dec 14, 2024 · 398ab6c · 398ab6c
1 parent 970c809
commit 398ab6c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -83,7 +83,7 @@ jobs:
 
         - name: "Linux AppImage"
           artifact: "Linux-AppImage"
-          runs-on: ubuntu-22.04
+          runs-on: ubuntu-20.04
           os: linux
           appimage: true
           qt_tools: tools_opensslv3_src
@@ -184,6 +184,12 @@ jobs:
         path: "${{ runner.workspace }}/Qt/"
         key: "Qt-${{ matrix.config.qt_version }}-${{ matrix.config.qt_host }}-${{ matrix.config.qt_arch }}"
 
+    - name: "Fix Python version"
+      if: matrix.config.appimage
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
     - name: Install Qt via aqtinstall
       if: |
         ((matrix.config.os != 'linux') || matrix.config.appimage || matrix.config.snap || matrix.config.flatpak)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -325,6 +325,8 @@ if (WIN32)
     find_package(Qt6 REQUIRED Widgets)
     target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets)
 
+    add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
     target_link_libraries(${PROJECT_NAME} PRIVATE user32 advapi32 wininet)
 endif()