Commit c3509c1
authored
cmake: add HIDAPI_BUILD_AS_CXX to compile sources as C++ (#814)
Add an opt-in CMake variable HIDAPI_BUILD_AS_CXX that, when set to
TRUE, attaches LANGUAGE CXX to each backend's C source file so it is
compiled with the C++ compiler instead of the C compiler. Useful as a
portability check, to confirm hidapi sources remain compatible with
consumers that embed them into a C++ translation unit.
The variable is intentionally not declared as a CMake option(), so it
is not surfaced in cmake-gui or `cmake -L` output. It is documented
under "Testing-only variables" in BUILD.cmake.md.
Wire it through every backend (linux, libusb, mac, netbsd, windows).
For the windows backend, both hid.c and hidapi_descriptor_reconstruct.c
are re-tagged.
Three small mac/hid.c adjustments are required for Apple Clang to
accept the source as C++:
- cast CFTypeRef to CFNumberRef at CFNumberGetValue() (C allows
implicit void*-to-pointer conversion; C++ does not);
- mark BUF_LEN const so the stack buffer is a non-VLA array;
- cast calloc()'s return value when assigning to cur_dev->path.
CI: enable HIDAPI_BUILD_AS_CXX=ON on the ubuntu-cmake, macos-cmake
and windows-cmake jobs to guard against regressions. The MSVC variant
also sets CMAKE_CXX_STANDARD=20 so the designated initialisers in the
Windows backend compile as ISO C++ (g++ and Clang accept them as a
GNU extension in their default mode).
Assisted-by: Claude:claude-opus-4.71 parent e8243e1 commit c3509c1
9 files changed
Lines changed: 57 additions & 3 deletions
File tree
- .github/workflows
- libusb
- linux
- mac
- netbsd
- src
- windows
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
93 | 102 | | |
94 | 103 | | |
95 | 104 | | |
| |||
154 | 163 | | |
155 | 164 | | |
156 | 165 | | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
157 | 175 | | |
158 | 176 | | |
159 | 177 | | |
| |||
206 | 224 | | |
207 | 225 | | |
208 | 226 | | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
209 | 235 | | |
210 | 236 | | |
211 | 237 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
104 | 111 | | |
105 | 112 | | |
106 | 113 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
7 | 10 | | |
8 | 11 | | |
9 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
5 | 8 | | |
6 | 9 | | |
7 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
7 | 10 | | |
8 | 11 | | |
9 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
339 | 339 | | |
340 | 340 | | |
341 | 341 | | |
342 | | - | |
| 342 | + | |
343 | 343 | | |
344 | 344 | | |
345 | 345 | | |
| |||
544 | 544 | | |
545 | 545 | | |
546 | 546 | | |
547 | | - | |
| 547 | + | |
548 | 548 | | |
549 | 549 | | |
550 | 550 | | |
| |||
586 | 586 | | |
587 | 587 | | |
588 | 588 | | |
589 | | - | |
| 589 | + | |
590 | 590 | | |
591 | 591 | | |
592 | 592 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
5 | 8 | | |
6 | 9 | | |
7 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
41 | 47 | | |
42 | 48 | | |
43 | 49 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
21 | 24 | | |
22 | 25 | | |
23 | 26 | | |
| |||
0 commit comments