Skip to content

Commit d8e2f88

Browse files
committed
add preset for pipeline client build
1 parent ed7aba5 commit d8e2f88

File tree

2 files changed

+65
-10
lines changed

2 files changed

+65
-10
lines changed

.github/workflows/build-client.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,19 @@ jobs:
2929
- macos-11
3030
include:
3131
- os: windows-2022
32-
cmake_options: -DWITH_DRIVER_DIRECT3D=ON -DWITH_DRIVER_XAUDIO2=ON
32+
cmake_preset: windows-client
3333
- os: windows-2019
34-
cmake_options: -DWITH_DRIVER_DIRECT3D=ON -DWITH_DRIVER_XAUDIO2=ON
34+
cmake_preset: windows-client
3535
- os: ubuntu-22.04
3636
ubuntu_version: 22.04
37+
cmake_preset: linux-client
3738
- os: ubuntu-20.04
3839
ubuntu_version: 20.04
40+
cmake_preset: linux-client
3941
- os: macos-14
40-
cmake_options: -DWITH_LIBXML2_ICONV=OFF -GXcode
42+
cmake_preset: macos-client
4143
- os: macos-11
42-
cmake_options: -DWITH_LIBXML2_ICONV=OFF -GXcode
44+
cmake_preset: macos-client
4345

4446
steps:
4547
- uses: actions/checkout@v4
@@ -98,8 +100,7 @@ jobs:
98100
99101
- name: Configure CMake
100102
run: >
101-
cmake --preset client
102-
${{ matrix.cmake_options }}
103+
cmake --preset ${{ matrix.cmake_preset }}
103104
-DHUNTER_CONFIGURATION_TYPES=Release
104105
-DHUNTER_ENABLED=ON
105106
-DHUNTER_ROOT=${{ steps.strings.outputs.hunter-dir }}

CMakePresets.json

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,39 @@
44
{
55
"name": "base",
66
"hidden": true,
7-
"generator": "Ninja Multi-Config",
87
"binaryDir": "${sourceDir}/build"
98
},
109
{
11-
"inherits": [
12-
"base"
13-
],
10+
"name": "linux",
11+
"inherits": "base",
12+
"generator": "Ninja Multi-Config",
13+
"condition": {
14+
"type": "equals",
15+
"lhs": "${hostSystemName}",
16+
"rhs": "Linux"
17+
}
18+
},
19+
{
20+
"name": "windows",
21+
"inherits": "base",
22+
"condition": {
23+
"type": "equals",
24+
"lhs": "${hostSystemName}",
25+
"rhs": "Windows"
26+
}
27+
},
28+
{
29+
"name": "macos",
30+
"inherits": "base",
31+
"generator": "Xcode",
32+
"condition": {
33+
"type": "equals",
34+
"lhs": "${hostSystemName}",
35+
"rhs": "Darwin"
36+
}
37+
},
38+
{
39+
"inherits": "base",
1440
"name": "default",
1541
"cacheVariables": {
1642
"WITH_STATIC": true,
@@ -57,6 +83,34 @@
5783
"WITH_RYZOM_SERVER": false,
5884
"WITH_RYZOM_TOOLS": false
5985
}
86+
},
87+
{
88+
"inherits": [
89+
"linux",
90+
"client"
91+
],
92+
"name": "linux-client"
93+
},
94+
{
95+
"inherits": [
96+
"windows",
97+
"client"
98+
],
99+
"name": "windows-client",
100+
"cacheVariables": {
101+
"WITH_DRIVER_DIRECT3D": true,
102+
"WITH_DRIVER_XAUDIO2": true
103+
}
104+
},
105+
{
106+
"inherits": [
107+
"macos",
108+
"client"
109+
],
110+
"name": "macos-client",
111+
"cacheVariables": {
112+
"WITH_LIBXML2_ICONV": false
113+
}
60114
}
61115
],
62116
"buildPresets": [

0 commit comments

Comments
 (0)