@@ -22,6 +22,11 @@ is_darwin = host_machine.system() == 'darwin'
2222is_windows = host_machine .system() == ' windows'
2323cpp = meson .get_compiler(' cpp' )
2424
25+ add_project_arguments (
26+ cpp.get_supported_arguments(' -Wno-missing-template-arg-list-after-template-kw' ),
27+ language : ' cpp' ,
28+ )
29+
2530absl_algorithm_container_dep = dependency (' absl_algorithm_container' )
2631absl_any_invocable_dep = dependency (' absl_any_invocable' )
2732absl_base_dep = dependency (' absl_base' )
@@ -70,7 +75,12 @@ protoc_dep = dependency(
7075 required : false ,
7176)
7277if not protoc_dep.found()
73- protoc_dep = cpp.find_library (' protoc' ) # pkgconfig version does not provide protoc.pc
78+ # pkgconfig version does not provide protoc.pc
79+ if host_machine .system() == ' windows'
80+ protoc_dep = cpp.find_library (' libprotoc' )
81+ else
82+ protoc_dep = cpp.find_library (' protoc' )
83+ endif
7484endif
7585re2_dep = dependency (' re2' )
7686winsock_dep = is_windows ? [
@@ -1013,6 +1023,7 @@ grpc_unsecure_dep = declare_dependency(
10131023 include_directories : common_include_dirs,
10141024 dependencies : [gpr_dep, libcares_dep],
10151025)
1026+ meson .override_dependency(' grpc_unsecure' , grpc_unsecure_dep)
10161027
10171028libupb_json_lib = library (
10181029 ' upb_json_lib' ,
@@ -1913,6 +1924,7 @@ grpc_dep = declare_dependency(
19131924 include_directories : common_include_dirs,
19141925 dependencies : [gpr_dep, libcares_dep],
19151926)
1927+ meson .override_dependency(' grpc' , grpc_dep)
19161928
19171929libgrpcpp_unsecure = library (
19181930 ' grpc++_unsecure' ,
@@ -1973,6 +1985,7 @@ grpcpp_unsecure_dep = declare_dependency(
19731985 include_directories : common_include_dirs,
19741986 dependencies : [grpc_unsecure_dep],
19751987)
1988+ meson .override_dependency(' grpc++_unsecure' , grpcpp_unsecure_dep)
19761989
19771990libgrpcpp = library (
19781991 ' grpc++' ,
@@ -2067,6 +2080,7 @@ grpcpp_dep = declare_dependency(
20672080 include_directories : common_include_dirs,
20682081 dependencies : [grpc_dep],
20692082)
2083+ meson .override_dependency(' grpc++' , grpcpp_dep)
20702084
20712085libgrpcpp_alts = library (
20722086 ' grpc++_alts' ,
0 commit comments