Skip to content

Commit 2d9ae6e

Browse files
Add windows Arm64
1 parent 38aa061 commit 2d9ae6e

File tree

6 files changed

+22
-5
lines changed

6 files changed

+22
-5
lines changed

.github/actions/build-package/action.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,17 @@ runs:
77
- uses: seanmiddleditch/gha-setup-ninja@master
88

99
- uses: ilammy/msvc-dev-cmd@v1
10-
if: contains(matrix.cfg.ARCHITECTURE, '-x64-')
10+
if: contains(matrix.cfg.ARCHITECTURE, '-x64-msvc')
1111
with:
1212
arch: x64
1313

14+
- uses: ilammy/msvc-dev-cmd@v1
15+
if: contains(matrix.cfg.ARCHITECTURE, '-arm64-msvc')
16+
with:
17+
arch: amd64_arm64
18+
19+
# TODO: Add Windows ARM64EC architecture
20+
1421
- uses: shogo82148/actions-setup-perl@v1
1522
with:
1623
perl-version: '5.32'

.github/workflows/build-assimp.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ jobs:
2424
- { os: ubuntu-20.04, triple: linux-x64-gcc9 }
2525
- { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
2626
- { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
27-
- { os: windows-2022, triple: windows-x64-mingw64 }
2827
- { os: windows-2022, triple: windows-x64-msvc }
28+
- { os: windows-2022, triple: windows-arm64-msvc }
29+
- { os: windows-2022, triple: windows-x64-mingw64 }
2930

3031
steps:
3132
- name: Checkout repository

.github/workflows/build-freeimage.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ jobs:
2424
- { os: ubuntu-20.04, triple: linux-x64-gcc9 }
2525
- { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
2626
- { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
27-
- { os: windows-2022, triple: windows-x64-mingw64 }
2827
- { os: windows-2022, triple: windows-x64-msvc }
28+
- { os: windows-2022, triple: windows-arm64-msvc }
29+
- { os: windows-2022, triple: windows-x64-mingw64 }
2930

3031
steps:
3132
- name: Checkout repository

.github/workflows/build-libcurl.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ jobs:
2424
- { os: ubuntu-20.04, triple: linux-x64-gcc9 }
2525
- { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
2626
- { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
27-
- { os: windows-2022, triple: windows-x64-mingw64 }
2827
- { os: windows-2022, triple: windows-x64-msvc }
28+
- { os: windows-2022, triple: windows-arm64-msvc }
29+
- { os: windows-2022, triple: windows-x64-mingw64 }
2930

3031
steps:
3132
- name: Checkout repository

.github/workflows/build-mbedtls.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ jobs:
2424
- { os: ubuntu-20.04, triple: linux-x64-gcc9 }
2525
- { os: ubuntu-20.04, triple: linux-armv7-gcc9 }
2626
- { os: ubuntu-20.04, triple: linux-aarch64-gcc9 }
27-
- { os: windows-2022, triple: windows-x64-mingw64 }
2827
- { os: windows-2022, triple: windows-x64-msvc }
28+
- { os: windows-2022, triple: windows-arm64-msvc }
29+
- { os: windows-2022, triple: windows-x64-mingw64 }
2930

3031
steps:
3132
- name: Checkout repository

toolchains/windows-arm64-msvc.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
set (CMAKE_SYSTEM_NAME Windows)
2+
3+
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
4+
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
5+
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
6+
set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

0 commit comments

Comments
 (0)