Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 7 | -85/+325 | |
|\ \ | ||||||
| * | | replenish missed header files in install step | yjjnls | 2017-06-19 | 1 | -0/+2 | |
| | | | | | | | | | | | | install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0 | |||||
| * | | add protobuf_generate function, allows use of target_sources where available | Walter Gray | 2017-06-02 | 2 | -68/+116 | |
| | | | ||||||
| * | | fix check_and_save_build_option not correctly exporting build options | Walter Gray | 2017-05-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix the check_and_save_build_option macro never evaluating to true | Walter Gray | 2017-05-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix find module not working when no version number was given | Walter Gray | 2017-05-30 | 1 | -12/+14 | |
| |/ | ||||||
| * | Add headers as part of cmake project | Dennis Cappendijk | 2017-05-29 | 3 | -3/+192 | |
| | | | | | | | | tested only on windows with visual studio 2015 as generator | |||||
* | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 3 | -2/+3 | |
|/ | ||||||
* | Fix C++ build for down-integration. | Feng Xiao | 2017-03-29 | 1 | -0/+2 | |
| | ||||||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 2 | -1/+5 | |
| | ||||||
* | add delimited_message_util.cc to libprotobuf.cmake | Byron Yi | 2017-03-16 | 1 | -0/+1 | |
| | ||||||
* | migrate delimited messages functions to util package | Byron Yi | 2017-03-16 | 1 | -0/+1 | |
| | ||||||
* | Fix libprotoc.cmake to generate well_known_types_embed.cc | Konstantin Podsvirov | 2017-03-15 | 1 | -1/+1 | |
| | | | | | | Unfortunate typo. Just one extra ',' symbol, has led to the hidden implicit behavior. Now everything will be fine. | |||||
* | Double-quote file paths in extract_includes.bat.in | Feng Xiao | 2017-03-10 | 2 | -123/+117 | |
| | | | | | This allows the file path to contain spaces which is very common on windows. | |||||
* | Add missing thread dependency in cmake. | Feng Xiao | 2017-03-09 | 1 | -0/+1 | |
| | ||||||
* | Detect if Descriptor.cs changes for csharp | Jie Luo | 2017-03-02 | 1 | -0/+1 | |
| | ||||||
* | Disable MSVC warning C4309 | Wojciech Mamrak | 2017-02-18 | 1 | -1/+1 | |
| | | | | | > warning C4309: static_cast': truncation of constant value introduced in commit 9db5b11c9cf2922435b53495b9c1e114525f0428 | |||||
* | Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699) | Jonathan Hseu | 2017-02-10 | 1 | -1/+0 | |
| | | | the deprecated atomics. | |||||
* | Fixed "make check" for cmake build | Adam Cozzette | 2016-12-19 | 1 | -0/+1 | |
| | | | | | | | The check target did not depend on the test_plugin binary, so this would cause "make check" to fail at times because of the absence of test_plugin. This change adds a dependency on test_plugin so that it will always get built before the tests are executed. | |||||
* | Auto-generate well_known_types_embed.cc | Adam Cozzette | 2016-12-19 | 1 | -0/+12 | |
| | | | | | | | Until now this file was just checked into the repo, but actually it should be generated from any.js, struct.js, and timestamp.js. This change updates the build system to make this happen. To make it work I also had to remove some C++11 features from embed.cc. | |||||
* | Add missing files. | Jisi Liu | 2016-12-05 | 1 | -0/+1 | |
| | ||||||
* | Updated libprotoc.cmake | Adam Cozzette | 2016-11-17 | 1 | -0/+1 | |
| | ||||||
* | Fixing references to the removed atomicops_internals_pnacl.h file. | Sergio Campama | 2016-11-10 | 1 | -1/+1 | |
| | ||||||
* | update files to include php generators | Jisi Liu | 2016-10-10 | 1 | -0/+2 | |
| | ||||||
* | Added new has_bits.h file to cmake/extract_includes.bat.in (#2152) | Adam Cozzette | 2016-10-10 | 1 | -0/+1 | |
| | | | | This is necessary so that the CMake build knows to include this header file in the installation include/ directory. | |||||
* | Remove inexist files from build. | Feng Xiao | 2016-10-06 | 1 | -2/+0 | |
| | ||||||
* | update files to include php generators (#2165) | Jisi Liu | 2016-10-06 | 2 | -1/+4 | |
| | ||||||
* | Check in php implementation. (#2052) | Paul Yang | 2016-09-15 | 2 | -0/+2 | |
| | | | | | This pull request includes two implementation: C extension and PHP package. Both implementations support encode/decode of singular, repeated and map fields. | |||||
* | Rename UNICODE to protobuf_UNICODE | Wei-Yin Chen (陳威尹) | 2016-09-01 | 1 | -2/+2 | |
| | ||||||
* | Support Unicode build on Windows | Wei-Yin Chen (陳威尹) | 2016-08-31 | 1 | -0/+4 | |
| | ||||||
* | Merge pull request #1842 from udnaan/master | Feng Xiao | 2016-08-08 | 1 | -1/+1 | |
|\ | | | | | fixed cmake config files install path | |||||
| * | fixed cmake config files install path | Adnan | 2016-07-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | Merge pull request #1865 from podsvirov/topic-cmake-project | Feng Xiao | 2016-08-03 | 4 | -2/+9 | |
|\ \ | | | | | | | CMake: Improvements and Bugfixes | |||||
| * | | CMake: Auto find ZLIB from package config if nedded | Konstantin Podsvirov | 2016-08-02 | 2 | -0/+5 | |
| | | | ||||||
| * | | CMake: Bugfix for protobuf_MODULE_COMPATIBLE | Konstantin Podsvirov | 2016-07-28 | 1 | -1/+0 | |
| | | | | | | | | | | | | Removed excess endif() | |||||
| * | | CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabled | Konstantin Podsvirov | 2016-07-28 | 1 | -1/+4 | |
| |/ | ||||||
* / | CMake: remove repeated_field_reflection.h from extract list | Konstantin Podsvirov | 2016-08-01 | 1 | -1/+0 | |
|/ | ||||||
* | Merge remote-tracking branch 'origin/3.0.0-beta-4' | Feng Xiao | 2016-07-18 | 2 | -64/+64 | |
|\ | ||||||
| * | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 2 | -64/+64 | |
| | | ||||||
* | | Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to ↵ | Walter Gray | 2016-07-12 | 1 | -1/+1 | |
|/ | | | | be ignored. | |||||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 1 | -2/+2 | |
| | ||||||
* | Merge pull request #1666 from yeswalrus/cmake-prerelease-examples | Feng Xiao | 2016-06-17 | 2 | -15/+22 | |
|\ | | | | | CMake Fix up prerelease version handling | |||||
| * | Fix prerelease version matching to be more consistent with the find_package ↵ | Walter Gray | 2016-06-09 | 2 | -15/+22 | |
| | | | | | | | | arguments. | |||||
* | | Merge pull request #1658 from yeswalrus/cmake-fixup-module | Feng Xiao | 2016-06-15 | 1 | -24/+9 | |
|\ \ | | | | | | | Cleanup protobuf-module.cmake.in | |||||
| * | | Removed handling for ALIASED targets since they are unused. | Walter Gray | 2016-06-07 | 1 | -24/+9 | |
| |/ | ||||||
* | | make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use. | Walter Gray | 2016-06-09 | 1 | -1/+3 | |
| | | ||||||
* | | Save the relevant options used to create a package, allow users to reject ↵ | Walter Gray | 2016-06-09 | 2 | -11/+20 | |
|/ | | | | packages based on them. | |||||
* | Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning | Feng Xiao | 2016-06-07 | 2 | -17/+30 | |
|\ | | | | | CMake prerelease versioning | |||||
| * | For prerelease versions, require protobuf_FIND_VERSION to be set. | Walter Gray | 2016-05-31 | 1 | -16/+22 | |
| | | ||||||
| * | Include the prerelease version in the protobuf_VERSION | Walter Gray | 2016-05-31 | 1 | -1/+8 | |
| | |