diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-20 11:53:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 11:53:48 -0800 |
| commit | 9b72cad7f0c7c3bc364cb471bf624e6cae3e1aef (patch) | |
| tree | 1b3ddf0236f76e923b5da71e14e588f0afb928ac /ports/grpc | |
| parent | e01aec15e6ddf11022bbcf64bd87eb5e9ddcd036 (diff) | |
| download | vcpkg-9b72cad7f0c7c3bc364cb471bf624e6cae3e1aef.tar.gz vcpkg-9b72cad7f0c7c3bc364cb471bf624e6cae3e1aef.zip | |
[abseil] Re-fix cxx 17 standard, add macro ABSL_USE_CXX17 (#14647)
* [abseil] Re-fix cxx 17 standard, add macro ABSL_USE_CXX17 to `absl-config.cmake`
* [grpc] Fix build failure when abseil use cxx 17 standard
* Update ports/abseil/portfile.cmake
Diffstat (limited to 'ports/grpc')
| -rw-r--r-- | ports/grpc/00012-fix-use-cxx17.patch | 16 | ||||
| -rw-r--r-- | ports/grpc/CONTROL | 1 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/ports/grpc/00012-fix-use-cxx17.patch b/ports/grpc/00012-fix-use-cxx17.patch new file mode 100644 index 000000000..012db102b --- /dev/null +++ b/ports/grpc/00012-fix-use-cxx17.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1911144..c749d28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,6 +257,11 @@ include(cmake/re2.cmake) + include(cmake/ssl.cmake) + include(cmake/upb.cmake) + include(cmake/zlib.cmake) ++ ++if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++endif() + + if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) + set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread) diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index f44b4e00e..f5954763e 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,5 +1,6 @@ Source: grpc Version: 1.33.1 +Port-Version: 1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2 Homepage: https://github.com/grpc/grpc Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index a082a6963..8253fe3e6 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( 00010-add-feature-absl-sync.patch 00011-fix-csharp_plugin.patch snprintf.patch + 00012-fix-use-cxx17.patch ) if((NOT VCPKG_TARGET_IS_LINUX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) |