Skip to content

Commit

Permalink
WIP: test MSVC crash workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
rgriebl committed Dec 15, 2024
1 parent 970c809 commit 2ded77c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -312,10 +318,9 @@ jobs:
run: |
sudo DEBIAN_FRONTEND=noninteractive apt -y update
sudo DEBIAN_FRONTEND=noninteractive apt -y install \
g++-10 cmake ninja-build libglvnd-dev libtbb-dev libxkbcommon-dev libxkbcommon-x11-0 \
ninja-build libglvnd-dev libtbb-dev libxkbcommon-dev libxkbcommon-x11-0 \
libxcb-\* libpulse-dev libgstreamer\*1.0-dev libsecret-1-dev libva-dev libcups2-dev libfuse2
${Qt6_DIR}/bin/qt-cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_COMPILER=/usr/bin/gcc-10 -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \
${{ matrix.config.cmake_extra_config }} -B build -S .
cmake --build build --config RelWithDebInfo --parallel --verbose
env DESTDIR=build/BrickStore-Install cmake --install build --config RelWithDebInfo --prefix /usr
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit 2ded77c

Please sign in to comment.