Jisi Liu
39a2a25f05
update files to include php generators ( #2165 )
2016-09-22 17:13:11 -07:00
Adam Cozzette
050c014ac6
Added new has_bits.h file to cmake/extract_includes.bat.in ( #2152 )
...
This is necessary so that the CMake build knows to include this header
file in the installation include/ directory.
2016-09-21 10:40:26 -07:00
Paul Yang
e0e54661f7
Check in php implementation. ( #2052 )
...
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
2016-09-15 11:09:01 -07:00
Wei-Yin Chen (陳威尹)
a7eaf36967
Rename UNICODE to protobuf_UNICODE
2016-09-01 17:18:22 -07:00
Wei-Yin Chen (陳威尹)
588a803d58
Support Unicode build on Windows
2016-08-31 17:28:51 -07:00
Feng Xiao
56b8f44eed
Merge pull request #1842 from udnaan/master
...
fixed cmake config files install path
2016-08-08 13:43:45 -07:00
Feng Xiao
0dca3cc5d6
Merge pull request #1865 from podsvirov/topic-cmake-project
...
CMake: Improvements and Bugfixes
2016-08-03 11:03:15 -07:00
Konstantin Podsvirov
eefd1fdd48
CMake: Auto find ZLIB from package config if nedded
2016-08-02 22:37:36 +03:00
Konstantin Podsvirov
7d275ec168
CMake: remove repeated_field_reflection.h from extract list
2016-08-01 20:54:41 +03:00
Konstantin Podsvirov
33d2b2a04f
CMake: Bugfix for protobuf_MODULE_COMPATIBLE
...
Removed excess endif()
2016-07-28 01:32:32 +03:00
Konstantin Podsvirov
38c5f2f3e6
CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabled
2016-07-28 01:28:49 +03:00
Adnan
154e278a2f
fixed cmake config files install path
...
Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.
This brings us more into line with other langauges, and makes it more
obvious when we are requiring protobuf generated code.
Add a script to build protoc zip packages.
[ci skip]
Change-Id: Ia0e0bf3bb6bd24633dc8f294318bb20ac837f8b9
Ruby: translate package names from snake_case -> PascalCase.
Added unit test for PascalCasing package names in Ruby.
Added new file to ruby_EXTRA_DIST.
2016-07-26 12:25:10 -07:00
Feng Xiao
2078f614e4
Merge remote-tracking branch 'origin/3.0.0-beta-4'
2016-07-18 14:57:47 -07:00
Feng Xiao
9086d96439
Integrate from internal code base.
2016-07-13 13:48:40 -07:00
Walter Gray
5520447a78
Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to be ignored.
2016-07-12 15:19:32 -07:00
Otto Kekäläinen
3808d091f8
Fix spelling in strings and comments
2016-07-03 15:26:04 +03:00
Feng Xiao
4f93098eb3
Merge pull request #1666 from yeswalrus/cmake-prerelease-examples
...
CMake Fix up prerelease version handling
2016-06-17 13:15:49 -07:00
Feng Xiao
52598c646e
Merge pull request #1658 from yeswalrus/cmake-fixup-module
...
Cleanup protobuf-module.cmake.in
2016-06-15 17:06:36 -07:00
Walter Gray
4150a91c14
make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use.
2016-06-09 17:27:46 -07:00
Walter Gray
78b3498bf4
Save the relevant options used to create a package, allow users to reject packages based on them.
2016-06-09 17:27:46 -07:00
Walter Gray
5ebcfc1cfd
Fix prerelease version matching to be more consistent with the find_package arguments.
2016-06-09 17:22:31 -07:00
Walter Gray
cadfbc8e2f
Removed handling for ALIASED targets since they are unused.
2016-06-07 20:33:24 -07:00
Feng Xiao
6aa981f949
Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning
...
CMake prerelease versioning
2016-06-07 14:08:03 -07:00
Walter Gray
23fef56e6d
Replace handwritten protobuf-targets with exported version.
2016-06-06 12:06:55 -07:00
Walter Gray
09f6a5c1d2
Use ExternalProject_Add to build the examples in a stand-alone fashion.
2016-06-06 12:06:55 -07:00
Konstantin Podsvirov
71556295ff
CMake project updates
...
A series of improvements:
- Improved Protobuf module compatibility (disabled by default);
- Hide advanced settings;
- Added build tree configuration;
- Added build of examples.
2016-06-04 00:10:07 +03:00
Bo Yang
20b532544f
Integrate interanl changes
2016-06-02 15:44:32 -07:00
Walter Gray
0420eab173
For prerelease versions, require protobuf_FIND_VERSION to be set.
2016-05-31 17:47:18 -07:00
Walter Gray
f1091ab1aa
Include the prerelease version in the protobuf_VERSION
2016-05-31 17:07:41 -07:00
Feng Xiao
cc30be105c
Merge pull request #1613 from yeswalrus/cmake-min-version
...
Bump cmake minimum required version to 2.8.12
2016-05-31 18:35:28 -04:00
Walter Gray
457a2975f4
Remove __PROTOBUF_PACKAGE_PREFIX
2016-05-28 01:59:58 -07:00
Walter Gray
d13b3d0d96
remove useless cleanup - config.cmake files are executed in their own context.
2016-05-26 23:49:28 -07:00
Walter Gray
c57c6eabf7
Bump to the *real* minimum required version. Setting CMP0022 breaks CMake versions < 2.8.12
2016-05-26 23:39:17 -07:00
Walter Gray
04265e40da
Remove if(TRUE)
2016-05-26 18:05:58 -07:00
Jeff Merver
733ef986e5
added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88
2016-05-21 16:01:32 -07:00
Walter Gray
28f35b4f16
add protobuf:: namespace to installed targets
2016-05-20 18:03:32 -07:00
Feng Xiao
2338e03570
Merge pull request #1576 from wal-rus/cmake-versionfile
...
Make protobuf-config-version.cmake.in set the required variables
2016-05-20 11:50:00 -07:00
Walter Gray
02a28a8fea
Update protobuf-config-version.cmake.in to correctly set the required variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE)
2016-05-19 15:25:03 -07:00
Walter Gray
7d79458fc5
Fix the cmake configuration file install path to be more standards compliant (See the description of cmake's config search behavior on https://cmake.org/cmake/help/v3.4/command/find_package.html )
2016-05-19 14:52:04 -07:00
Jisi Liu
f86d39c295
Update file lists.
2016-04-28 14:43:22 -07:00
Jisi Liu
1f4f3e26bd
Update file list to include the missing extension lite file.
2016-04-18 14:12:08 -07:00
Josh Haberman
4465daa57a
Merge branch 'master' into internal-merge
2016-04-07 14:10:19 -07:00
Gaurav Vaish
74d8b0bebc
Added access_level for types
...
* `csharp_options`: Added `Options` to encapsulate generator options.
Supported options for now - file_extension, base_namespace
* `{Blah}Generator`: Now accept `Options*` as parameter to constructor
* `csharp_generator.cc`: Parse and populate options
* `Makefile.am`: Added `csharp_options.h`
* `extract_includes.bat.in`: Added `csharp_options.h`
Refactoring code to two commits. This is the first commit
2016-04-05 09:47:11 -07:00
Jisi Liu
3b6df0612d
Allow bigobj for map_unittest
2016-04-01 15:02:45 -07:00
Josh Haberman
fe96a215d9
Clarified that 'nmake' must be run before 'nmake check'.
2016-02-10 14:44:29 -08:00
Jisi Liu
5221dcbe47
Integrate from google internal.
...
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
2016-01-29 13:51:05 -08:00
Dongjoon Hyun
7b08d49e9d
Fix typos in README.md/CHANGES.txt
2016-01-11 14:52:01 -08:00
Feng Xiao
ef6c72b46b
Update BUILD/cmake files.
...
Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d
2015-12-28 17:33:55 -08:00
Feng Xiao
d217808417
Merge branch master into v3.0.0-beta-2
2015-12-21 00:34:19 -08:00
Feng Xiao
e841bac4fc
Down-integrate from internal code base.
2015-12-11 17:10:28 -08:00