AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
5,220 Commits 35 Branches 138 Tags 124 MiB
a27da09339
Commit Graph

163 Commits

Author SHA1 Message Date
Adam Cozzette
a27da09339 Merge branch '3.5.x' into 3.5.x-merge 2017-11-30 13:34:51 -08:00
Yangqing Jia
cba18efe18 Allow one to omit building libprotoc and protoc binaries 2017-11-13 15:15:39 -08:00
Jisi Liu
181e284b55 Fix Atomic32/AtomicWord on some platforms. 
- 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.
 2017-11-08 15:27:48 -08:00
Jisi Liu
4526d8baa0
Merge pull request #3722 from timou/cmake-windows-clean 
Suppress VS2017 compiler/linker warnings
 2017-10-27 12:37:30 -07:00
Tim Ebringer
a23669c2f6 Sort MSVC warning suppressions 
Add brief documentation describing each warning suppression.
 2017-10-21 09:40:32 -04:00
Jisi Liu
07b9238a1c Merge pull request #3770 from pherl/3.5-integrate 
Integrate google internal changes for the up coming 3.5 release.
 2017-10-19 10:48:54 -07:00
Jisi Liu
9c407a16e4 Merge pull request #3751 from uykusuz/master 
fixes issue #3750
 2017-10-18 15:39:12 -07:00
Jisi Liu
1a7a7fca80 Merge from google internal 2017-10-18 12:22:18 -07:00
Boris Broenner
be13314b2a fixes issue #3750 
In protobuf-module.cmake: in addition to checking for release or debug
variants of protoc's location we should also check the configuration "noconfig".
 2017-10-14 00:41:40 +02:00
Tim Ebringer
2a72840425 Suppress VS2017 compiler/linker warnings 
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.
 2017-10-06 15:56:30 -04:00
Markus Heß
f7e209951e protobuf_generate: create include path only for proto files 2017-09-29 11:07:36 +02:00
Markus Heß
0e069e5a2d generate python code when calling PROTOBUF_GENERATE_PYTHON 2017-09-25 11:08:12 +02:00
Markus Heß
9829b8f511 protobuf_generate: add EXPORT_MACRO option 2017-09-22 11:44:59 +02:00
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Feng Xiao
471b45e895 Merge pull request #3158 from yeswalrus/fix-policy-warning 
Fix policy warning CMP0054
 2017-09-13 15:15:04 -07:00
Markus Heß
444aecd35a fix protobuf_generate function 2017-09-12 10:00:04 +02:00
Jisi Liu
d77c8c5e44 remove the duplication 2017-08-01 14:01:55 -07:00
Jisi Liu
12c186f7c6 Fix makefile.am 2017-07-25 14:38:00 -07:00
Jisi Liu
e177739fa2 Fix build files 2017-07-25 14:37:19 -07:00
Jisi Liu
759245a49a Merge from master 2017-07-25 11:52:33 -07:00
Jisi Liu
1876a27e66 Update filelist again 2017-07-19 14:46:49 -07:00
Jisi Liu
8084e03c33 remove profile 2017-07-19 12:46:33 -07:00
Jisi Liu
11b6661e66 update build file list 2017-07-19 12:10:43 -07:00
Jisi Liu
3af881c7e2 Merge master into 3.4.x 2017-07-18 16:26:16 -07:00
Jisi Liu
09354db143 Merge from Google internal for 3.4 release 2017-07-18 15:38:30 -07:00
yjjnls
8f367c0b2d replenish missed header files in install step 
install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0
 2017-06-19 14:15:54 +08:00
Walter Gray
0336770801 add protobuf_generate function, allows use of target_sources where available 2017-06-02 19:57:08 -07:00
Walter Gray
d8c5865e25 Fix policy warning CMP0054 2017-05-30 15:08:45 -07:00
Walter Gray
faa53989cb fix check_and_save_build_option not correctly exporting build options 2017-05-30 15:04:11 -07:00
Walter Gray
a183a0df61 Fix the check_and_save_build_option macro never evaluating to true 2017-05-30 15:04:11 -07:00
Walter Gray
ae85cb8ef3 Fix find module not working when no version number was given 2017-05-30 15:04:11 -07:00
Dennis Cappendijk
4eb02fe31e Add headers as part of cmake project 
tested only on windows with visual studio 2015 as generator
 2017-05-29 17:34:08 +02:00
Feng Xiao
32d7830e4b Fix C++ build for down-integration. 2017-03-29 14:52:33 -07:00
Feng Xiao
d36c0c538a Down-integrate from google3. 2017-03-29 14:33:05 -07:00
Byron Yi
acaa9407e3 add delimited_message_util.cc to libprotobuf.cmake 2017-03-16 20:52:58 +08:00
Byron Yi
cb3e84b78e migrate delimited messages functions to util package 2017-03-16 20:01:22 +08:00
Konstantin Podsvirov
97cbc42621 Fix libprotoc.cmake to generate well_known_types_embed.cc 
Unfortunate typo. Just one extra ',' symbol, has led to the hidden implicit behavior.

Now everything will be fine.
 2017-03-15 14:16:49 -07:00
Feng Xiao
c94555f955 Double-quote file paths in extract_includes.bat.in 
This allows the file path to contain spaces which is very common on
windows.
 2017-03-10 16:32:19 -08:00
Feng Xiao
1ece7c09af Add missing thread dependency in cmake. 2017-03-09 17:02:17 -08:00
Jie Luo
af13bff3c7 Detect if Descriptor.cs changes for csharp 2017-03-02 17:15:58 -08:00
Wojciech Mamrak
37bd5d525b Disable MSVC warning C4309 
> warning C4309: static_cast': truncation of constant value

introduced in commit 9db5b11c9c
 2017-02-18 15:44:29 +01:00
Jonathan Hseu
ef927cc428 Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699) 
the deprecated atomics.
 2017-02-10 14:55:34 -08:00
Adam Cozzette
98d89d4277 Fixed "make check" for cmake build 
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.
 2016-12-19 14:38:21 -08:00
Adam Cozzette
1b3a0c16e6 Auto-generate well_known_types_embed.cc 
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.
 2016-12-19 14:38:21 -08:00
Jisi Liu
f92b455aa6 Add missing files. 2016-12-05 10:16:47 -08:00
Adam Cozzette
1673389ef1 Updated libprotoc.cmake 2016-11-17 17:05:38 -08:00
Sergio Campama
e75cf40e8f Fixing references to the removed atomicops_internals_pnacl.h file. 2016-11-10 10:20:07 -05:00
Jisi Liu
9d4657a9e2 update files to include php generators 2016-10-10 11:43:48 -07:00
Adam Cozzette
7fecfdbaa8 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-10-10 11:43:48 -07:00
Feng Xiao
431cee60e6 Remove inexist files from build. 2016-10-06 16:36:45 -07:00