From 4f1c195bf9c7647d9b9adec95c86e66c350cc0c3 Mon Sep 17 00:00:00 2001 From: iarspider Date: Mon, 4 Oct 2021 14:53:17 +0200 Subject: grpc: update recipe (#25261) 1) forward `+shared` to re2 2) add `cxxstd` variant 3) use "more idiomatic" way of setting CMake options --- var/spack/repos/builtin/packages/grpc/package.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/grpc/package.py b/var/spack/repos/builtin/packages/grpc/package.py index bdc62ac930..40ee6574bd 100644 --- a/var/spack/repos/builtin/packages/grpc/package.py +++ b/var/spack/repos/builtin/packages/grpc/package.py @@ -40,20 +40,25 @@ class Grpc(CMakePackage): variant('codegen', default=True, description='Builds code generation plugins for protobuf ' 'compiler (protoc)') + variant('cxxstd', + default='11', + values=('11', '14', '17'), + multi=False, + description='Use the specified C++ standard when building.') depends_on('protobuf') depends_on('openssl') depends_on('zlib') depends_on('c-ares') depends_on('abseil-cpp', when='@1.27:') + depends_on('re2+shared', when='@1.33.1:+shared') depends_on('re2', when='@1.33.1:') def cmake_args(self): args = [ - '-DBUILD_SHARED_LIBS:Bool={0}'.format( - 'ON' if '+shared' in self.spec else 'OFF'), - '-DgRPC_BUILD_CODEGEN:Bool={0}'.format( - 'ON' if '+codegen' in self.spec else 'OFF'), + define_from_variant('BUILD_SHARED_LIBS', 'shared'), + define_from_variant('gRPC_BUILD_CODEGEN', 'codegen'), + define_from_variant('CMAKE_CXX_STANDARD', 'cxxstd'), '-DgRPC_BUILD_CSHARP_EXT:Bool=OFF', '-DgRPC_INSTALL:Bool=ON', # Tell grpc to skip vendoring and look for deps via find_package: -- cgit v1.2.3-60-g2f50