From 343cb0ecb97c09daf18d0cf873fd239ddf4c36f7 Mon Sep 17 00:00:00 2001 From: "Denny C. Dai" Date: Tue, 20 Sep 2022 13:59:17 -0700 Subject: [PATCH] Setting C++ lang dialect for objc cocoapod specs (#31071) --- gRPC-C++.podspec | 1 + gRPC-Core.podspec | 1 + gRPC-ProtoRPC.podspec | 1 + gRPC-RxLibrary.podspec | 1 + gRPC.podspec | 1 + templates/gRPC-C++.podspec.template | 1 + templates/gRPC-Core.podspec.template | 1 + templates/gRPC-ProtoRPC.podspec.template | 1 + templates/gRPC-RxLibrary.podspec.template | 1 + templates/gRPC.podspec.template | 1 + 10 files changed, 10 insertions(+) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 0cadab78990..a7cedfd66f3 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -64,6 +64,7 @@ Pod::Spec.new do |s| # build. 'USE_HEADERMAP' => 'NO', 'ALWAYS_SEARCH_USER_PATHS' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } s.libraries = 'c++' diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index d45c4a2f9dd..dd6c9f08bc9 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -84,6 +84,7 @@ Pod::Spec.new do |s| 'ALWAYS_SEARCH_USER_PATHS' => 'NO', 'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1"', 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } s.default_subspecs = 'Interface', 'Implementation' diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index b1b63eec1fc..86e819d4da8 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -84,5 +84,6 @@ Pod::Spec.new do |s| # This is needed by all pods that depend on gRPC-RxLibrary: 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES', 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } end diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index 15b9fe43695..1e7f504254e 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -66,5 +66,6 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } end diff --git a/gRPC.podspec b/gRPC.podspec index 74c3e52f951..4e6fbe2644b 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -42,6 +42,7 @@ Pod::Spec.new do |s| # This is needed by all pods that depend on gRPC-RxLibrary: 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES', 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } s.ios.deployment_target = '9.0' diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index 0d5d3d71ee1..5fd35a7906f 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -146,6 +146,7 @@ # build. 'USE_HEADERMAP' => 'NO', 'ALWAYS_SEARCH_USER_PATHS' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } s.libraries = 'c++' diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 4eefb4e71ea..8c300e6fb4f 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -170,6 +170,7 @@ 'ALWAYS_SEARCH_USER_PATHS' => 'NO', 'GCC_PREPROCESSOR_DEFINITIONS' => '"$(inherited)" "COCOAPODS=1"', 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } s.default_subspecs = 'Interface', 'Implementation' diff --git a/templates/gRPC-ProtoRPC.podspec.template b/templates/gRPC-ProtoRPC.podspec.template index ee7eb99e503..a1f24edced8 100644 --- a/templates/gRPC-ProtoRPC.podspec.template +++ b/templates/gRPC-ProtoRPC.podspec.template @@ -86,5 +86,6 @@ # This is needed by all pods that depend on gRPC-RxLibrary: 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES', 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } end diff --git a/templates/gRPC-RxLibrary.podspec.template b/templates/gRPC-RxLibrary.podspec.template index ac51486a334..f06b61fda44 100644 --- a/templates/gRPC-RxLibrary.podspec.template +++ b/templates/gRPC-RxLibrary.podspec.template @@ -68,5 +68,6 @@ s.pod_target_xcconfig = { 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } end diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 068dd3d725f..9bcdd477e7d 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -44,6 +44,7 @@ # This is needed by all pods that depend on gRPC-RxLibrary: 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES', 'CLANG_WARN_STRICT_PROTOTYPES' => 'NO', + 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } s.ios.deployment_target = '9.0'