Skip to content

Commit 91955d9

Browse files
kohnechkohnech
authored
Merge branch 'develop' into bugfix/compile-for-ubuntu-22.04
2 parents bfc9755 + 4d2f73d commit 91955d9

File tree

2 files changed

+306
-1
lines changed

2 files changed

+306
-1
lines changed

‎.github/workflows/ccpp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
os: [macos-10.15, windows-latest, ubuntu-22.04]
11+
os: [macos-latest, windows-latest, ubuntu-22.04]
1212
steps:
1313
- uses: actions/checkout@v1
1414
- name: check versions

‎CMakePresets.json

+305
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,305 @@
1+
{
2+
"version": 3,
3+
"cmakeMinimumRequired" : {
4+
"major": 3,
5+
"minor": 20,
6+
"patch": 0
7+
},
8+
"configurePresets": [
9+
{
10+
"name": "windows-base",
11+
"hidden": true,
12+
"binaryDir": "${sourceDir}/build/${presetName}",
13+
"architecture": {
14+
"value": "x64",
15+
"strategy": "external"
16+
},
17+
"condition": {
18+
"type": "equals",
19+
"lhs": "${hostSystemName}",
20+
"rhs": "Windows"
21+
}
22+
},
23+
{
24+
"name": "windows-msvc-base",
25+
"hidden": true,
26+
"inherits": "windows-base",
27+
"cacheVariables": {
28+
"CMAKE_CXX_COMPILER": "cl.exe"
29+
},
30+
"vendor": {
31+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
32+
"intelliSenseMode": "windows-msvc-x64"
33+
}
34+
}
35+
},
36+
{
37+
"name": "windows-clang-base",
38+
"hidden": true,
39+
"inherits": "windows-base",
40+
"cacheVariables": {
41+
"CMAKE_CXX_COMPILER": "clang-cl.exe"
42+
},
43+
"vendor": {
44+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
45+
"intelliSenseMode": "windows-clang-x64"
46+
}
47+
}
48+
},
49+
{
50+
"name": "linux-base",
51+
"hidden": true,
52+
"binaryDir": "${sourceDir}/build/${presetName}",
53+
"condition": {
54+
"type": "equals",
55+
"lhs": "${hostSystemName}",
56+
"rhs": "Linux"
57+
},
58+
"vendor": {
59+
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
60+
"sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
61+
},
62+
"microsoft.com/VisualStudioSettings/CMake/1.0": {
63+
"intelliSenseMode": "linux-gcc-x64",
64+
"hostOS": [
65+
"Linux"
66+
]
67+
}
68+
}
69+
},
70+
{
71+
"name": "linux-gcc-base",
72+
"hidden": true,
73+
"inherits": "linux-base",
74+
"cacheVariables": {
75+
"CMAKE_CXX_COMPILER": "g++"
76+
}
77+
},
78+
{
79+
"name": "linux-clang-base",
80+
"hidden": true,
81+
"inherits": "linux-base",
82+
"cacheVariables": {
83+
"CMAKE_CXX_COMPILER": "clang++"
84+
}
85+
},
86+
{
87+
"name": "apple-m1-base",
88+
"hidden": true,
89+
"binaryDir": "${sourceDir}/build/${presetName}",
90+
"architecture": {
91+
"value": "arm64",
92+
"strategy": "external"
93+
},
94+
"condition": {
95+
"type": "equals",
96+
"lhs": "${hostSystemName}",
97+
"rhs": "Darwin"
98+
},
99+
"cacheVariables": {
100+
"CMAKE_OSX_ARCHITECTURES": "arm64"
101+
}
102+
},
103+
{
104+
"name": "ninja",
105+
"hidden": true,
106+
"generator": "Ninja"
107+
},
108+
{
109+
"name": "make",
110+
"hidden": true,
111+
"generator": "Unix Makefiles"
112+
},
113+
{
114+
"name": "_release",
115+
"hidden": true,
116+
"cacheVariables": {
117+
"CMAKE_BUILD_TYPE": "Release"
118+
}
119+
},
120+
{
121+
"name": "_debug",
122+
"hidden": true,
123+
"cacheVariables": {
124+
"CMAKE_BUILD_TYPE": "Debug"
125+
}
126+
},
127+
{
128+
"name": "_relwithdebinfo",
129+
"hidden": true,
130+
"cacheVariables": {
131+
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
132+
}
133+
},
134+
{
135+
"name": "linux-clang-debug",
136+
"inherits": [
137+
"linux-clang-base",
138+
"make",
139+
"_debug"
140+
]
141+
},
142+
{
143+
"name": "linux-clang-release",
144+
"inherits": [
145+
"linux-clang-base",
146+
"make",
147+
"_release"
148+
]
149+
},
150+
{
151+
"name": "linux-clang-relwithdebinfo",
152+
"inherits": [
153+
"linux-clang-base",
154+
"make",
155+
"_relwithdebinfo"
156+
]
157+
},
158+
{
159+
"name": "linux-gcc-debug",
160+
"inherits": [
161+
"linux-gcc-base",
162+
"make",
163+
"_debug"
164+
]
165+
},
166+
{
167+
"name": "linux-gcc-release",
168+
"inherits": [
169+
"linux-gcc-base",
170+
"make",
171+
"_release"
172+
]
173+
},
174+
{
175+
"name": "linux-gcc-relwithdebinfo",
176+
"inherits": [
177+
"linux-gcc-base",
178+
"make",
179+
"_relwithdebinfo"
180+
]
181+
},
182+
{
183+
"name": "linux-clang-ninja-debug",
184+
"inherits": [
185+
"linux-clang-debug",
186+
"ninja"
187+
]
188+
},
189+
{
190+
"name": "linux-clang-ninja-release",
191+
"inherits": [
192+
"linux-clang-release",
193+
"ninja"
194+
]
195+
},
196+
{
197+
"name": "linux-clang-ninja-relwithdebinfo",
198+
"inherits": [
199+
"linux-clang-relwithdebinfo",
200+
"ninja"
201+
]
202+
},
203+
{
204+
"name": "linux-gcc-ninja-debug",
205+
"inherits": [
206+
"linux-gcc-debug",
207+
"ninja"
208+
]
209+
},
210+
{
211+
"name": "linux-gcc-ninja-release",
212+
"inherits": [
213+
"linux-gcc-release",
214+
"ninja"
215+
]
216+
},
217+
{
218+
"name": "linux-gcc-ninja-relwithdebinfo",
219+
"inherits": [
220+
"linux-gcc-relwithdebinfo",
221+
"ninja"
222+
]
223+
},
224+
{
225+
"name": "linux-gcc-debug-with-clang-tidy",
226+
"inherits": [
227+
"linux-gcc-base",
228+
"make",
229+
"_debug"
230+
],
231+
"cacheVariables": {
232+
"USE_CLANG_TIDY": "ON"
233+
}
234+
},
235+
{
236+
"name": "windows-clang-ninja-release",
237+
"inherits": [
238+
"windows-clang-base",
239+
"ninja",
240+
"_release"
241+
]
242+
},
243+
{
244+
"name": "windows-clang-ninja-debug",
245+
"inherits": [
246+
"windows-clang-base",
247+
"ninja",
248+
"_debug"
249+
]
250+
},
251+
{
252+
"name": "windows-clang-ninja-relwithdebinfo",
253+
"inherits": [
254+
"windows-clang-base",
255+
"ninja",
256+
"_relwithdebinfo"
257+
]
258+
},
259+
{
260+
"name": "windows-msvc-ninja-release",
261+
"inherits": [
262+
"windows-msvc-base",
263+
"ninja",
264+
"_release"
265+
]
266+
},
267+
{
268+
"name": "windows-msvc-debug",
269+
"inherits": [
270+
"windows-msvc-base",
271+
"_debug"
272+
]
273+
},
274+
{
275+
"name": "windows-msvc-ninja-debug",
276+
"inherits": [
277+
"windows-msvc-base",
278+
"ninja",
279+
"_debug"
280+
]
281+
},
282+
{
283+
"name": "windows-msvc-ninja-relwithdebinfo",
284+
"inherits": [
285+
"windows-msvc-base",
286+
"ninja",
287+
"_relwithdebinfo"
288+
]
289+
},
290+
{
291+
"name": "apple-m1-ninja-debug",
292+
"description": "Apple M1 preset",
293+
"inherits": [
294+
"apple-m1-base",
295+
"ninja",
296+
"_debug"
297+
],
298+
"cacheVariables": {
299+
"ENABLE_TESTS": "OFF",
300+
"BUILD_SHARED_LIBS": false,
301+
"ENABLE_COMPONENT_TESTS": "OFF"
302+
}
303+
}
304+
]
305+
}

0 commit comments

Comments
 (0)