aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-08-20 13:37:38 -0700
committerGitHub <noreply@github.com>2018-08-20 13:37:38 -0700
commit5d38db4d514d41f8e1caceb2e20c2a6dfbc736b3 (patch)
tree6ade1f2bc31308c4c11116e4edd5a6fe02fc2638 /Makefile.am
parent859405a62b5058c0352dc608a7fd887f29f48afe (diff)
parentd2c35ce4cb6ff767712a879f6bfad9d50ada577d (diff)
downloadprotobuf-5d38db4d514d41f8e1caceb2e20c2a6dfbc736b3.tar.gz
protobuf-5d38db4d514d41f8e1caceb2e20c2a6dfbc736b3.tar.bz2
protobuf-5d38db4d514d41f8e1caceb2e20c2a6dfbc736b3.zip
Merge pull request #5048 from jozefizso/fix/4579_backport_for_3.6.x3.6.x
Include version information in Windows binaries (backport #4579 for 3.6.x)
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index ae4ac858..8334db60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1036,6 +1036,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
cmake/protobuf.pc.cmake \
cmake/protoc.cmake \
cmake/tests.cmake \
+ cmake/version.rc.in \
editors/README.txt \
editors/proto.vim \
editors/protobuf-mode.el \