Skip to content

Commit 5a97d91

Browse files
committed
workflow: remove ncis generator
1 parent c1e4bad commit 5a97d91

File tree

2 files changed

+114
-7
lines changed

2 files changed

+114
-7
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424

25-
- name: Install NSIS (Windows)
26-
if: matrix.os == 'windows-latest'
27-
run: |
28-
choco install nsis -y
29-
echo "C:\Program Files (x86)\NSIS" >> $GITHUB_PATH
30-
3125
- name: Install Linux deps
3226
if: matrix.os == 'ubuntu-latest'
3327
run: |

CMakePresets.json

Lines changed: 114 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,69 @@
1919
"CMAKE_COLOR_DIAGNOSTICS": "ON"
2020
}
2121
},
22+
{
23+
"name": "android-base",
24+
"displayName": "Android Base",
25+
"description": "Base preset for Android builds using official NDK",
26+
"hidden": true,
27+
"inherits": "base",
28+
"cacheVariables": {
29+
"CMAKE_SYSTEM_NAME": "Android",
30+
"CMAKE_ANDROID_NDK": "$env{ANDROID_NDK_HOME}",
31+
"CMAKE_ANDROID_STL_TYPE": "c++_shared",
32+
"CMAKE_ANDROID_API": "24"
33+
},
34+
"condition": {
35+
"type": "equals",
36+
"lhs": "${hostSystemName}",
37+
"rhs": "Android"
38+
}
39+
},
40+
{
41+
"name": "android-arm64",
42+
"displayName": "Android (arm64-v8a)",
43+
"description": "64-bit ARM Android build",
44+
"inherits": "android-base",
45+
"cacheVariables": {
46+
"CMAKE_ANDROID_ARCH_ABI": "arm64-v8a"
47+
}
48+
},
49+
{
50+
"name": "android-arm32",
51+
"displayName": "Android (armeabi-v7a)",
52+
"description": "32-bit ARM Android build",
53+
"inherits": "android-base",
54+
"cacheVariables": {
55+
"CMAKE_ANDROID_ARCH_ABI": "armeabi-v7a"
56+
}
57+
},
58+
{
59+
"name": "android-x64",
60+
"displayName": "Android (x86_64)",
61+
"description": "64-bit x86 Android build (emulator)",
62+
"inherits": "android-base",
63+
"cacheVariables": {
64+
"CMAKE_ANDROID_ARCH_ABI": "x86_64"
65+
}
66+
},
67+
{
68+
"name": "android-x86",
69+
"displayName": "Android (x86)",
70+
"description": "32-bit x86 Android build (emulator)",
71+
"inherits": "android-base",
72+
"cacheVariables": {
73+
"CMAKE_ANDROID_ARCH_ABI": "x86"
74+
}
75+
},
76+
{
77+
"name": "android-universal",
78+
"displayName": "Android (Universal)",
79+
"description": "Build all ABIs in one go (for AAR or multi-APK)",
80+
"inherits": "android-base",
81+
"cacheVariables": {
82+
"CMAKE_ANDROID_ARCH_ABI": "arm64-v8a;armeabi-v7a;x86_64;x86"
83+
}
84+
},
2285
{
2386
"name": "msvc",
2487
"displayName": "Microsoft Visual C++",
@@ -61,6 +124,31 @@
61124
}
62125
],
63126
"buildPresets": [
127+
{
128+
"name": "android-arm64",
129+
"displayName": "Build Android (arm64)",
130+
"configurePreset": "android-arm64"
131+
},
132+
{
133+
"name": "android-arm32",
134+
"displayName": "Build Android (arm32)",
135+
"configurePreset": "android-arm32"
136+
},
137+
{
138+
"name": "android-x64",
139+
"displayName": "Build Android (x64)",
140+
"configurePreset": "android-x64"
141+
},
142+
{
143+
"name": "android-x86",
144+
"displayName": "Build Android (x86)",
145+
"configurePreset": "android-x86"
146+
},
147+
{
148+
"name": "android-universal",
149+
"displayName": "Build Android (All ABIs)",
150+
"configurePreset": "android-universal"
151+
},
64152
{
65153
"name": "msvc",
66154
"displayName": "MSVC Build",
@@ -125,11 +213,17 @@
125213
}
126214
],
127215
"packagePresets": [
216+
{
217+
"name": "android-package",
218+
"displayName": "Android Package",
219+
"configurePreset": "android-universal",
220+
"generators": ["ZIP"]
221+
},
128222
{
129223
"name": "msvc-package",
130224
"displayName": "MSVC Package",
131225
"configurePreset": "msvc",
132-
"generators": ["ZIP", "NSIS"]
226+
"generators": ["ZIP"]
133227
},
134228
{
135229
"name": "clang-package",
@@ -145,6 +239,25 @@
145239
}
146240
],
147241
"workflowPresets": [
242+
{
243+
"name": "android-full",
244+
"displayName": "Android Complete Pipeline",
245+
"description": "Configure, build, and package for all Android ABIs",
246+
"steps": [
247+
{
248+
"type": "configure",
249+
"name": "android-universal"
250+
},
251+
{
252+
"type": "build",
253+
"name": "android-universal"
254+
},
255+
{
256+
"type": "package",
257+
"name": "android-package"
258+
}
259+
]
260+
},
148261
{
149262
"name": "msvc-full",
150263
"displayName": "MSVC Complete Pipeline",

0 commit comments

Comments
 (0)