diff options
| author |  Srini Polavarapu <35056280+srini100@users.noreply.github.com> | 2018-03-29 13:09:51 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-29 13:09:51 -0700 |
| commit | b48c912b6fd2df0e3d2cad4993229ce54d16a2a1 (patch) | |
| tree | 867c4165beaf8a4c711762cc6100cf49ef3ce35d /templates | |
| parent | 6bdfcc7d6daa4fc9df4a6a888264fd5c4869f351 (diff) | |
| parent | cdc0e28fe56fafc5134cbf137a5894644ff9a22d (diff) | |
Merge pull request #14821 from srini100/master
Bump protobuf version check from 3.0.0 to 3.5.0
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index c0ce2e5cb4..354f2a2f40 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -416,7 +416,7 @@ OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl OPENSSL_NPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib - PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0 protobuf + PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.5.0 protobuf CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares else # HAS_PKG_CONFIG @@ -844,7 +844,7 @@ @echo @echo "DEPENDENCY ERROR" @echo - @echo "The target you are trying to run requires protobuf 3.0.0+" + @echo "The target you are trying to run requires protobuf 3.5.0+" @echo "Your system doesn't have it, and neither does the third_party directory." @echo @echo "Please consult INSTALL to get more information." @@ -858,7 +858,7 @@ @echo @echo "DEPENDENCY ERROR" @echo - @echo "The target you are trying to run requires protobuf-compiler 3.0.0+" + @echo "The target you are trying to run requires protobuf-compiler 3.5.0+" @echo "Your system doesn't have it, and neither does the third_party directory." @echo @echo "Please consult INSTALL to get more information." @@ -1636,7 +1636,7 @@ % endif % if lib.language == 'c++': ## If the lib was C++, we have to close the Makefile's if that tested - ## the presence of protobuf 3.0.0+ + ## the presence of protobuf 3.5.0+ endif % endif @@ -1702,7 +1702,7 @@ ifeq ($(NO_PROTOBUF),true) - # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+. + # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+. $(BINDIR)/$(CONFIG)/${tgt.name}: protobuf_dep_error |