diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-05-03 14:14:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 14:14:17 -0700 |
| commit | 82583bb6fec57279f31cbcb42c41bfcb18647d5b (patch) | |
| tree | 8d1a9ce2feec04842ab213bd5a415014ecd675aa | |
| parent | eefee7408133f3a0fef711ef9c6a3677b7e06fd7 (diff) | |
| download | vcpkg-82583bb6fec57279f31cbcb42c41bfcb18647d5b.tar.gz vcpkg-82583bb6fec57279f31cbcb42c41bfcb18647d5b.zip | |
[grpc] Create codegen feature (#17424)
* [grpc] Create codegen feature
* [grpc] Update port-version
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/grpc/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/grpc/vcpkg.json | 9 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/grpc.json | 5 |
4 files changed, 16 insertions, 7 deletions
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index fb05b0c59..e932c153c 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -22,10 +22,7 @@ vcpkg_from_github( 00013-build-upbdefs.patch ) -if(TARGET_TRIPLET STREQUAL HOST_TRIPLET) - set(gRPC_BUILD_CODEGEN ON) -else() - set(gRPC_BUILD_CODEGEN OFF) +if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") endif() @@ -42,6 +39,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES absl-sync gRPC_ABSL_SYNC_ENABLE + codegen gRPC_BUILD_CODEGEN ) vcpkg_configure_cmake( @@ -67,7 +65,6 @@ vcpkg_configure_cmake( -DgRPC_INSTALL_LIBDIR:STRING=lib -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc - -DgRPC_BUILD_CODEGEN=${gRPC_BUILD_CODEGEN} -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX} -DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX} ) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 976e2700c..a3515788e 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "grpc", "version-semver": "1.37.0", + "port-version": 1, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ @@ -11,7 +12,10 @@ }, { "name": "grpc", - "host": true + "host": true, + "features": [ + "codegen" + ] }, "openssl", "protobuf", @@ -26,6 +30,9 @@ "features": { "absl-sync": { "description": "Use abseil synchronization module" + }, + "codegen": { + "description": "Build code generator machinery" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 18a4341b2..5f11b1b2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2370,7 +2370,7 @@ }, "grpc": { "baseline": "1.37.0", - "port-version": 0 + "port-version": 1 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 1ef6c9c33..556e616db 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8f98b29393d0964e617d4182cc4915925b737285", + "version-semver": "1.37.0", + "port-version": 1 + }, + { "git-tree": "948866c5f70f79855a8cdb961af79701e46dc63e", "version-semver": "1.37.0", "port-version": 0 |