Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Qt5 Apple Silicon builds forcing x86_64 arch #40

Merged
merged 2 commits into from
May 13, 2024
+10 −9
Merged

Fix Qt5 Apple Silicon builds forcing x86_64 arch #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfbc4f3
Fix Qt5 Apple Silicon builds forcing x86_64 arch
dantti May 13, 2024
c2dfe6f
Merge branch '1.1' into dantti/fix_mac_arm
dantti May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ jobs:
- ubuntu-latest
- windows-latest
- macos-latest

build_type:
- Debug
#- Release
qt:
- version: "5.15.2"
requested: "5.15"
- version: "6.5.3"
requested: "6.5.*"

config:
- qt_version: "5.15.2"
cmake_osx_architectures: "x86_64"

- qt_version: "6.5.3"

steps:
- name: Install Qt with options and default aqtversion
uses: jurplel/install-qt-action@v3
with:
aqtversion: null # use whatever the default is
modules: ${{ matrix.qt.modules }}
version: ${{ matrix.qt.requested }}
version: ${{ matrix.config.qt_version }}
cache: true

- name: Checkout sources
Expand All @@ -56,7 +56,8 @@ jobs:
run: >
cmake -S . -B ./build -G Ninja
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DKDSingleApplication_QT6=${{ startsWith(matrix.qt.version, '6.') }}
-DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.cmake_osx_architectures}}
-DKDSingleApplication_QT6=${{ startsWith(matrix.config.qt_version, '6.') }}
-DKDSingleApplication_DEVELOPER_MODE=${{ matrix.build_type == 'Debug' }}
-DKDSingleApplication_TESTS=${{ matrix.build_type == 'Debug' }}
-DKDSingleApplication_EXAMPLES=${{ matrix.build_type == 'Debug' }}
Expand Down