From f933c30226de5ed5616f4174eed5c6d192646bda Mon Sep 17 00:00:00 2001 From: Lily <47812810+LilyWangL@users.noreply.github.com> Date: Sat, 28 Mar 2020 11:52:58 +0800 Subject: [PATCH] [abseil] Add compiler C++17. (#8248) * [abseil] Add compiler C++17. * Add feature c++17. --- ports/abseil/CONTROL | 7 +++++-- ports/abseil/portfile.cmake | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 2e4f9e5220852a..7e3f54a8bc038b 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,7 +1,10 @@ Source: abseil -Version: 2020-03-03 +Version: 2020-03-03-1 Homepage: https://github.com/abseil/abseil-cpp Description: an open-source collection designed to augment the C++ standard library. Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you. - Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole. \ No newline at end of file + Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole. + +Feature: c++17 +Description: Enable compiler C++17. diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 4bc6e76ddc657b..c569d766aa12ec 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -11,9 +11,16 @@ vcpkg_from_github( fix-uwp-build.patch ) +set(CMAKE_CXX_STANDARD ) +if("c++17" IN_LIST FEATURES) + set(CMAKE_CXX_STANDARD 17) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} ) vcpkg_install_cmake()