Skip to content

Commit d0d3a4b

Browse files
ThePhDThePhD
committed
🛠️ Fixes to work with MinGW
- 💭 Sure hope they use the ucrt version in there...
1 parent 2355ed8 commit d0d3a4b

File tree

8 files changed

+397
-57
lines changed

8 files changed

+397
-57
lines changed

‎.github/workflows/push-pull_request.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jobs:
3232
os: ubuntu
3333
- compiler: msvc
3434
os: macos
35-
- compiler: gcc
36-
os: windows
3735
runs-on: ${{matrix.os}}-latest
3836
env:
3937
CMAKE_CXX_STANDARD: ${{matrix.cxx_standard}}

‎CMakePresets.json‎

Lines changed: 283 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,57 @@
8888
"ZTD_THREAD_DOCUMENTATION": true,
8989
"ZTD_THREAD_DOCUMENTATION_NO_SPHINX": true
9090
}
91+
},
92+
{
93+
"name": "local-base",
94+
"description": "Initial values for configuration",
95+
"displayName": "Core values for user CMake builds",
96+
"inherits": "base",
97+
"hidden": true,
98+
"binaryDir": "${sourceDir}/.cmake/build-${hostSystemName}",
99+
"installDir": "${sourceDir}/.cmake/install-${hostSystemName}",
100+
"warnings": {
101+
"dev": true
102+
},
103+
"cacheVariables": {
104+
"ZTD_THREAD_SCRATCH": true,
105+
"ZTD_THREAD_TESTS": true,
106+
"ZTD_THREAD_EXAMPLES": true,
107+
"ZTD_THREAD_DOCUMENTATION": true,
108+
"FETCHCONTENT_SOURCE_DIR_ZTD.CMAKE": "${sourceDir}/../cmake",
109+
"FETCHCONTENT_SOURCE_DIR_ZTD.CUNEICODE": "${sourceDir}/../cuneicode",
110+
"FETCHCONTENT_SOURCE_DIR_ZTD.ENCODING_TABLES": "${sourceDir}/../encoding_tables",
111+
"FETCHCONTENT_SOURCE_DIR_ZTD.IDK": "${sourceDir}/../idk",
112+
"CMAKE_CXX_STANDARD": "23",
113+
"CMAKE_C_STANDARD": "23"
114+
}
115+
},
116+
{
117+
"name": "local-clang",
118+
"displayName": "Local Clang",
119+
"description": "Local default Clang configuration",
120+
"inherits": [
121+
"local-base",
122+
"clang"
123+
]
124+
},
125+
{
126+
"name": "local-gcc",
127+
"displayName": "Local GCC",
128+
"description": "Local default GCC configuration",
129+
"inherits": [
130+
"local-base",
131+
"gcc"
132+
]
133+
},
134+
{
135+
"name": "local-msvc",
136+
"displayName": "Local MSVC",
137+
"description": "Local default MSVC configuration",
138+
"inherits": [
139+
"local-base",
140+
"msvc"
141+
]
91142
}
92143
],
93144
"buildPresets": [
@@ -190,6 +241,69 @@
190241
"targets": [
191242
"ztd.idk.documentation.doxygen"
192243
]
244+
},
245+
{
246+
"name": "local-msvc-debug",
247+
"displayName": "Local Debug MSVC",
248+
"hidden": false,
249+
"inherits": "debug",
250+
"configurePreset": "local-msvc"
251+
},
252+
{
253+
"name": "local-msvc-release-debug",
254+
"displayName": "Local Release-Debug MSVC",
255+
"hidden": false,
256+
"inherits": "release-debug",
257+
"configurePreset": "local-msvc"
258+
},
259+
{
260+
"name": "local-msvc-release",
261+
"displayName": "Local Release MSVC",
262+
"hidden": false,
263+
"inherits": "release",
264+
"configurePreset": "local-msvc"
265+
},
266+
{
267+
"name": "local-clang-debug",
268+
"displayName": "Local Debug Clang",
269+
"hidden": false,
270+
"inherits": "debug",
271+
"configurePreset": "local-clang"
272+
},
273+
{
274+
"name": "local-clang-release-debug",
275+
"displayName": "Local Release-Debug Clang",
276+
"hidden": false,
277+
"inherits": "release-debug",
278+
"configurePreset": "local-clang"
279+
},
280+
{
281+
"name": "local-clang-release",
282+
"displayName": "Local Release Clang",
283+
"hidden": false,
284+
"inherits": "release",
285+
"configurePreset": "local-clang"
286+
},
287+
{
288+
"name": "local-gcc-debug",
289+
"displayName": "Local Debug GCC",
290+
"hidden": false,
291+
"inherits": "debug",
292+
"configurePreset": "local-gcc"
293+
},
294+
{
295+
"name": "local-gcc-release-debug",
296+
"displayName": "Local Release-Debug GCC",
297+
"hidden": false,
298+
"inherits": "release-debug",
299+
"configurePreset": "local-gcc"
300+
},
301+
{
302+
"name": "local-gcc-release",
303+
"displayName": "Local Release GCC",
304+
"hidden": false,
305+
"inherits": "release",
306+
"configurePreset": "local-gcc"
193307
}
194308
],
195309
"testPresets": [
@@ -268,6 +382,69 @@
268382
"displayName": "Release GCC",
269383
"inherits": "release",
270384
"configurePreset": "gcc"
385+
},
386+
{
387+
"name": "local-msvc-debug",
388+
"displayName": "Local Debug MSVC",
389+
"hidden": false,
390+
"inherits": "debug",
391+
"configurePreset": "local-msvc"
392+
},
393+
{
394+
"name": "local-msvc-release-debug",
395+
"displayName": "Local Release-Debug MSVC",
396+
"hidden": false,
397+
"inherits": "release-debug",
398+
"configurePreset": "local-msvc"
399+
},
400+
{
401+
"name": "local-msvc-release",
402+
"displayName": "Local Release MSVC",
403+
"hidden": false,
404+
"inherits": "release",
405+
"configurePreset": "local-msvc"
406+
},
407+
{
408+
"name": "local-clang-debug",
409+
"displayName": "Local Debug Clang",
410+
"hidden": false,
411+
"inherits": "debug",
412+
"configurePreset": "local-clang"
413+
},
414+
{
415+
"name": "local-clang-release-debug",
416+
"displayName": "Local Release-Debug Clang",
417+
"hidden": false,
418+
"inherits": "release-debug",
419+
"configurePreset": "local-clang"
420+
},
421+
{
422+
"name": "local-clang-release",
423+
"displayName": "Local Release Clang",
424+
"hidden": false,
425+
"inherits": "release",
426+
"configurePreset": "local-clang"
427+
},
428+
{
429+
"name": "local-gcc-debug",
430+
"displayName": "Local Debug GCC",
431+
"hidden": false,
432+
"inherits": "debug",
433+
"configurePreset": "local-gcc"
434+
},
435+
{
436+
"name": "local-gcc-release-debug",
437+
"displayName": "Local Release-Debug GCC",
438+
"hidden": false,
439+
"inherits": "release-debug",
440+
"configurePreset": "local-gcc"
441+
},
442+
{
443+
"name": "local-gcc-release",
444+
"displayName": "Local Release GCC",
445+
"hidden": false,
446+
"inherits": "release",
447+
"configurePreset": "local-gcc"
271448
}
272449
],
273450
"packagePresets": [],
@@ -406,6 +583,111 @@
406583
"name": "readthedocs"
407584
}
408585
]
586+
},
587+
{
588+
"name": "local-msvc",
589+
"displayName": "Local MSVC",
590+
"description": "Full Local Workflow for the MSVC toolchain",
591+
"steps": [
592+
{
593+
"type": "configure",
594+
"name": "local-msvc"
595+
},
596+
{
597+
"type": "build",
598+
"name": "local-msvc-debug"
599+
},
600+
{
601+
"type": "build",
602+
"name": "local-msvc-release-debug"
603+
},
604+
{
605+
"type": "build",
606+
"name": "local-msvc-release"
607+
},
608+
{
609+
"type": "test",
610+
"name": "local-msvc-debug"
611+
},
612+
{
613+
"type": "test",
614+
"name": "local-msvc-release-debug"
615+
},
616+
{
617+
"type": "test",
618+
"name": "local-msvc-release"
619+
}
620+
]
621+
},
622+
{
623+
"name": "local-gcc",
624+
"displayName": "Local GCC",
625+
"description": "Full Local Workflow for the GCC toolchain",
626+
"steps": [
627+
{
628+
"type": "configure",
629+
"name": "local-gcc"
630+
},
631+
{
632+
"type": "build",
633+
"name": "local-gcc-debug"
634+
},
635+
{
636+
"type": "build",
637+
"name": "local-gcc-release-debug"
638+
},
639+
{
640+
"type": "build",
641+
"name": "local-gcc-release"
642+
},
643+
{
644+
"type": "test",
645+
"name": "local-gcc-debug"
646+
},
647+
{
648+
"type": "test",
649+
"name": "local-gcc-release-debug"
650+
},
651+
{
652+
"type": "test",
653+
"name": "local-gcc-release"
654+
}
655+
]
656+
},
657+
{
658+
"name": "local-clang",
659+
"displayName": "Local Clang",
660+
"description": "Full Local Workflow for the Clang toolchain",
661+
"steps": [
662+
{
663+
"type": "configure",
664+
"name": "local-clang"
665+
},
666+
{
667+
"type": "build",
668+
"name": "local-clang-debug"
669+
},
670+
{
671+
"type": "build",
672+
"name": "local-clang-release-debug"
673+
},
674+
{
675+
"type": "build",
676+
"name": "local-clang-release"
677+
},
678+
{
679+
"type": "test",
680+
"name": "local-clang-debug"
681+
},
682+
{
683+
"type": "test",
684+
"name": "local-clang-release-debug"
685+
},
686+
{
687+
"type": "test",
688+
"name": "local-clang-release"
689+
}
690+
]
409691
}
410692
]
411-
}
693+
}

0 commit comments

Comments
 (0)