Skip to content

Commit 649647a

Browse files
committed
That moment when, just as you're about to pass out, you finally realize exactly what the problem is--
1 parent b6689d2 commit 649647a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/cmake-multi-platform.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
qt_arch: linux
3131
qt_version: 5.15.2
3232
sys_arch: x86_64
33+
install_prefix: -DCMAKE_INSTALL_PREFIX=/usr
3334
pretty: "Linux x86 AppImage"
3435
- os: ubuntu-22.04-arm
3536
c_compiler: clang
@@ -38,6 +39,7 @@ jobs:
3839
qt_arch: linux_arm64
3940
qt_version: 6.7.3
4041
sys_arch: aarch64
42+
install_prefix: -DCMAKE_INSTALL_PREFIX=/usr
4143
pretty: "Linux ARM AppImage"
4244
exclude:
4345
- os: windows-2019
@@ -56,15 +58,15 @@ jobs:
5658
uses: jdpurcell/install-qt-action@v5
5759
with:
5860
version: '${{ matrix.qt_version }}'
59-
archives: 'qtbase qtserialport qttools icu'
61+
archives: 'qtbase qtserialport icu'
6062
- name: Install Qt(6)
6163
if: ${{ matrix.qt_version != '5.15.2' }}
6264
uses: jdpurcell/install-qt-action@v5
6365
with:
6466
version: '${{ matrix.qt_version }}'
6567
host: '${{ matrix.qt_arch }}'
6668
modules: 'qtserialport'
67-
archives: 'qtbase qttools icu'
69+
archives: 'qtbase icu'
6870

6971
- name: Configure CMake
7072
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -74,6 +76,7 @@ jobs:
7476
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
7577
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
7678
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
79+
${{ matrix.install_prefix }}
7780
-S ${{ github.workspace }}
7881
7982
- name: Build

0 commit comments

Comments
 (0)