@@ -70,7 +70,12 @@ protoc_dep = dependency(
7070 required : false ,
7171)
7272if not protoc_dep.found()
73- protoc_dep = cpp.find_library (' protoc' ) # pkgconfig version does not provide protoc.pc
73+ # pkgconfig version does not provide protoc.pc
74+ if host_machine .system() == ' windows'
75+ protoc_dep = cpp.find_library (' libprotoc' )
76+ else
77+ protoc_dep = cpp.find_library (' protoc' )
78+ endif
7479endif
7580re2_dep = dependency (' re2' )
7681winsock_dep = is_windows ? [
@@ -1013,6 +1018,7 @@ grpc_unsecure_dep = declare_dependency(
10131018 include_directories : common_include_dirs,
10141019 dependencies : [gpr_dep, libcares_dep],
10151020)
1021+ meson .override_dependency(' grpc_unsecure' , grpc_unsecure_dep)
10161022
10171023libupb_json_lib = library (
10181024 ' upb_json_lib' ,
@@ -1913,6 +1919,7 @@ grpc_dep = declare_dependency(
19131919 include_directories : common_include_dirs,
19141920 dependencies : [gpr_dep, libcares_dep],
19151921)
1922+ meson .override_dependency(' grpc' , grpc_dep)
19161923
19171924libgrpcpp_unsecure = library (
19181925 ' grpc++_unsecure' ,
@@ -1973,6 +1980,7 @@ grpcpp_unsecure_dep = declare_dependency(
19731980 include_directories : common_include_dirs,
19741981 dependencies : [grpc_unsecure_dep],
19751982)
1983+ meson .override_dependency(' grpc++_unsecure' , grpcpp_unsecure_dep)
19761984
19771985libgrpcpp = library (
19781986 ' grpc++' ,
@@ -2067,6 +2075,7 @@ grpcpp_dep = declare_dependency(
20672075 include_directories : common_include_dirs,
20682076 dependencies : [grpc_dep],
20692077)
2078+ meson .override_dependency(' grpc++' , grpcpp_dep)
20702079
20712080libgrpcpp_alts = library (
20722081 ' grpc++_alts' ,
0 commit comments