Skip to content

Commit eed9d07

Browse files
committed
🛠 Forgot a semicolon, wee!
1 parent 9e3a8b6 commit eed9d07

2 files changed

Lines changed: 36 additions & 19 deletions

File tree

CMakePresets.json

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,37 @@
2424
"ZTD_THREAD_DOCUMENTATION": false
2525
}
2626
},
27+
{
28+
"name": "base-gcc-windows",
29+
"description": "Initial values for configuration (GCC for Windows)",
30+
"displayName": "Core values for user CMake builds (GCC for Windows)",
31+
"hidden": true,
32+
"condition": {
33+
"type": "equals",
34+
"lhs": "${hostSystemName}",
35+
"rhs": "Windows",
36+
"$comment": ""
37+
},
38+
"cacheVariables": {
39+
"CMAKE_CXX_LINK_EXECUTABLE": "lld-link",
40+
"CMAKE_C_LINK_EXECUTABLE": "lld-link"
41+
}
42+
},
43+
{
44+
"name": "base-gcc-macos",
45+
"description": "Initial values for configuration (GCC for MacOS)",
46+
"displayName": "Core values for user CMake builds (GCC for MacOS)",
47+
"hidden": true,
48+
"condition": {
49+
"type": "equals",
50+
"lhs": "${hostSystemName}",
51+
"rhs": "MacOS"
52+
},
53+
"cacheVariables": {
54+
"CMAKE_CXX_LINK_EXECUTABLE": "ld64.lld",
55+
"CMAKE_C_LINK_EXECUTABLE": "ld64.lld"
56+
}
57+
},
2758
{
2859
"name": "msvc",
2960
"description": "MSVC default configuration",
@@ -40,7 +71,9 @@
4071
"name": "gcc",
4172
"description": "GCC default configuration",
4273
"displayName": "GCC",
43-
"inherits": "base",
74+
"inherits": [
75+
"base"
76+
],
4477
"cacheVariables": {
4578
"CMAKE_CXX_COMPILER": "g++",
4679
"CMAKE_C_COMPILER": "gcc"
@@ -109,21 +142,6 @@
109142
"CMAKE_C_STANDARD": "23"
110143
}
111144
},
112-
{
113-
"name": "local-base-gcc",
114-
"description": "Initial values for configuration (GCC for Windows)",
115-
"displayName": "Core values for user CMake builds (GCC for Windows)",
116-
"hidden": true,
117-
"condition": {
118-
"type": "equals",
119-
"lhs": "${hostSystemName}",
120-
"rhs": "Windows"
121-
},
122-
"cacheVariables": {
123-
"CMAKE_CXX_LINK_EXECUTABLE": "lld.exe",
124-
"CMAKE_C_LINK_EXECUTABLE": "lld.exe"
125-
}
126-
},
127145
{
128146
"name": "local-clang",
129147
"displayName": "Local Clang",
@@ -139,7 +157,6 @@
139157
"description": "Local default GCC configuration",
140158
"inherits": [
141159
"local-base",
142-
"local-base-gcc",
143160
"gcc"
144161
]
145162
},
@@ -702,4 +719,4 @@
702719
]
703720
}
704721
]
705-
}
722+
}

tests/basic_run_time/source/attr.encoded_name.c.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ TEST_CASE("encoded thread name check", "[thrd][thrd_with_create_attrs][encoded-n
130130
REQUIRE(create_err1 == thrd_success); \
131131
int res1 = 0; \
132132
thrd_join(t1_arg.thr, &res1); \
133-
REQUIRE(res1 == 0xF5) \
133+
REQUIRE(res1 == 0xF5); \
134134
REQUIRE(res1 == t1_arg.id); \
135135
REQUIRE(t1_arg.name_set_result0 == thrd_success); \
136136
REQUIRE(t1_arg.name_get_result0 == thrd_success); \

0 commit comments

Comments
 (0)