Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix Atomic32/AtomicWord on some platforms. | Jisi Liu | 2017-11-08 | 1 | -1/+0 |
| | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms. | ||||
* | Merge pull request #3722 from timou/cmake-windows-clean | Jisi Liu | 2017-10-27 | 1 | -1/+20 |
|\ | | | | | Suppress VS2017 compiler/linker warnings | ||||
| * | Sort MSVC warning suppressions | Tim Ebringer | 2017-10-21 | 1 | -1/+17 |
| | | | | | | | | Add brief documentation describing each warning suppression. | ||||
| * | Suppress VS2017 compiler/linker warnings | Tim Ebringer | 2017-10-06 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | VS2017 warns about a few additional things, for example, files that define no symbols (which is typically the result of a platform specific ifdef not applying on Windows). Suppress these warnings so the build is clean on VS2017. | ||||
* | | Merge pull request #3770 from pherl/3.5-integrate | Jisi Liu | 2017-10-19 | 1 | -0/+1 |
|\ \ | | | | | | | Integrate google internal changes for the up coming 3.5 release. | ||||
| * | | Merge from google internal | Jisi Liu | 2017-10-18 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #3751 from uykusuz/master | Jisi Liu | 2017-10-18 | 1 | -0/+4 |
|\ \ | | | | | | | fixes issue #3750 | ||||
| * | | fixes issue #3750 | Boris Broenner | 2017-10-14 | 1 | -0/+4 |
| |/ | | | | | | | | | In protobuf-module.cmake: in addition to checking for release or debug variants of protoc's location we should also check the configuration "noconfig". | ||||
* / | protobuf_generate: create include path only for proto files | Markus Heß | 2017-09-29 | 1 | -15/+15 |
|/ | |||||
* | generate python code when calling PROTOBUF_GENERATE_PYTHON | Markus Heß | 2017-09-25 | 1 | -2/+2 |
| | |||||
* | protobuf_generate: add EXPORT_MACRO option | Markus Heß | 2017-09-22 | 2 | -4/+11 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 1 | -0/+1 |
| | |||||
* | Merge pull request #3158 from yeswalrus/fix-policy-warning | Feng Xiao | 2017-09-13 | 1 | -2/+2 |
|\ | | | | | Fix policy warning CMP0054 | ||||
| * | Fix policy warning CMP0054 | Walter Gray | 2017-05-30 | 1 | -2/+2 |
| | | |||||
* | | fix protobuf_generate function | Markus Heß | 2017-09-12 | 1 | -7/+12 |
| | | |||||
* | | remove the duplication | Jisi Liu | 2017-08-01 | 1 | -1/+0 |
| | | |||||
* | | Fix makefile.am | Jisi Liu | 2017-07-25 | 1 | -0/+1 |
| | | |||||
* | | Fix build files | Jisi Liu | 2017-07-25 | 3 | -5/+0 |
| | | |||||
* | | Merge from master | Jisi Liu | 2017-07-25 | 8 | -0/+38 |
| | | |||||
* | | Update filelist again | Jisi Liu | 2017-07-19 | 1 | -0/+1 |
| | | |||||
* | | remove profile | Jisi Liu | 2017-07-19 | 1 | -1/+0 |
| | | |||||
* | | update build file list | Jisi Liu | 2017-07-19 | 1 | -1/+0 |
| | | |||||
* | | 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. |