File tree Expand file tree Collapse file tree 2 files changed +14
-0
lines changed
subprojects/packagefiles/protobuf Expand file tree Collapse file tree 2 files changed +14
-0
lines changed Original file line number Diff line number Diff line change 3346
3346
" protoc"
3347
3347
],
3348
3348
"versions" : [
3349
+ " 25.2-4" ,
3349
3350
" 25.2-3" ,
3350
3351
" 25.2-2" ,
3351
3352
" 25.2-1" ,
Original file line number Diff line number Diff line change @@ -37,6 +37,17 @@ absl_string_view_dep = dependency(
37
37
default_options : [' cpp_std=c++17' ],
38
38
)
39
39
40
+ if meson .version().version_compare(' >=1.7.0' )
41
+ atomic_dep = dependency (' atomic' )
42
+ else
43
+ # Try to pick up libatomic. If it isn't available, hope that the host machine doesn't require it for atomics
44
+ # support. If it doesn't, protobuf will fail to compile.
45
+ atomic_dep = cc.find_library (
46
+ ' atomic' ,
47
+ required : false ,
48
+ )
49
+ endif
50
+
40
51
deps = [
41
52
dependency (' absl_base' ),
42
53
dependency (' absl_cord' ),
@@ -58,6 +69,7 @@ deps = [
58
69
' dbghelp' ,
59
70
required : host_machine .system() == ' windows' ,
60
71
),
72
+ atomic_dep,
61
73
]
62
74
63
75
incdir = include_directories (' src' )
@@ -136,6 +148,7 @@ protobuf_lite_dep = declare_dependency(
136
148
compile_args : imp,
137
149
link_with : libprotobuf_lite,
138
150
include_directories : incdir,
151
+ dependencies : atomic_dep,
139
152
)
140
153
141
154
libprotobuf_src = files (
You can’t perform that action at this time.
0 commit comments