Commit 1b4adae
committed
Fix build failure with the Protobuf 23.3
### Motivation
The current CMakeLists.txt does not work with the latest Protobuf
(23.3.0). It's because currently the Module mode is used to find
Protobuf, while the `FindProtobuf.cmake` is not updated to find the
Abseil dependency.
See protocolbuffers/protobuf#12292 (comment)
### Modifications
For macOS, use the Config mode to find Protobuf. It's because in other
systems, the Module mode works well. Besides, enable `PROTOBUF_USE_DLLS`
as a workaround for
protocolbuffers/protobuf#12983 is not released.1 parent 0202218 commit 1b4adae
4 files changed
Lines changed: 25 additions & 18 deletions
File tree
- .github/workflows
- wireshark
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
| 53 | + | |
58 | 54 | | |
59 | 55 | | |
60 | | - | |
| 56 | + | |
61 | 57 | | |
62 | 58 | | |
63 | 59 | | |
| |||
270 | 266 | | |
271 | 267 | | |
272 | 268 | | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
| 269 | + | |
278 | 270 | | |
279 | 271 | | |
280 | 272 | | |
281 | 273 | | |
282 | | - | |
| 274 | + | |
283 | 275 | | |
284 | 276 | | |
285 | | - | |
| 277 | + | |
286 | 278 | | |
287 | 279 | | |
288 | 280 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
139 | 145 | | |
140 | 146 | | |
141 | 147 | | |
| |||
173 | 179 | | |
174 | 180 | | |
175 | 181 | | |
176 | | - | |
| 182 | + | |
177 | 183 | | |
178 | 184 | | |
179 | 185 | | |
| |||
296 | 302 | | |
297 | 303 | | |
298 | 304 | | |
299 | | - | |
| 305 | + | |
300 | 306 | | |
301 | 307 | | |
302 | 308 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
| |||
45 | 47 | | |
46 | 48 | | |
47 | 49 | | |
48 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
49 | 56 | | |
50 | 57 | | |
51 | 58 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
| |||
0 commit comments