Commit 9a5bbec
authored
Fix string_view ABI mismatch between library and consumers (#1661)
The library was forced to build with CMAKE_CXX_STANDARD 11, so
JSONCPP_HAS_STRING_VIEW was never defined at compile time. Consumers
building with C++17 would see the string_view APIs in the header but
fail to link them.
Fix:
- Remove the global CMAKE_CXX_STANDARD 11 override; the existing
target_compile_features(cxx_std_11) already enforces the minimum.
- Detect string_view support at configure time with
check_cxx_source_compiles and export JSONCPP_HAS_STRING_VIEW as a
PUBLIC compile definition on all library targets, so consumers
always see the same value the library was built with.
- Guard the __cplusplus fallback in value.h so it does not override
the CMake-set define.
Fixes #15951 parent d4742c2 commit 9a5bbec
File tree
3 files changed
+20
-6
lines changed- include/json
- src/lib_json
3 files changed
+20
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | 43 | | |
50 | 44 | | |
51 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| 46 | + | |
45 | 47 | | |
46 | 48 | | |
47 | 49 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
28 | 34 | | |
29 | 35 | | |
30 | 36 | | |
| |||
125 | 131 | | |
126 | 132 | | |
127 | 133 | | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
128 | 138 | | |
129 | 139 | | |
130 | 140 | | |
| |||
158 | 168 | | |
159 | 169 | | |
160 | 170 | | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
161 | 175 | | |
162 | 176 | | |
163 | 177 | | |
| |||
184 | 198 | | |
185 | 199 | | |
186 | 200 | | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
187 | 205 | | |
188 | 206 | | |
189 | 207 | | |
| |||
0 commit comments