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

180 Commits

Author SHA1 Message Date
Carlos O'Ryan
3c5442a95d Include googletest as a submodule (#3993) 
Add googletest as a submodule in third_party/googletest.
 2018-03-26 13:54:32 -07:00
Feng Xiao
d5a0024171 Remove javanano. 2018-03-26 12:59:28 -07:00
Adam Cozzette
0c5fcdee44 Removed some unused C++ source files 2018-03-22 10:15:31 -07:00
Adam Cozzette
afe96b6d42 Merge branch 'master' into down-integrate 2018-03-13 16:54:31 -07:00
Adam Cozzette
0400cca323 Integrated internal changes from Google 2018-03-13 16:37:29 -07:00
Feng Xiao
fd595fcc93 Revert "Move compiler/plugin.pb.cc to libprotobuf with the other WKT sources." 
This reverts commit 724f0be33d.
 2018-03-01 16:36:05 -08:00
John Millikin
724f0be33d Move compiler/plugin.pb.cc to libprotobuf with the other WKT sources. 
This lets all values of `WELL_KNOWN_PROTOS` be treated the same with
regard to Bazel's protobuf blacklisting.
 2018-02-24 11:34:40 -08:00
Abdul Sami
fe33c5fe9d
Added instruction for existing ZLIB configuration 
Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
 2018-02-21 12:17:55 +05:00
Feng Xiao
82e0231607
Merge pull request #4259 from Mizux/master 
Various CMake Update
 2018-02-02 11:47:31 -08:00
Corentin Le Molgat
1ec9beb477 Use NEW behaviour for project VERSION variables. 
cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
 2018-02-01 20:31:50 +01:00
Corentin Le Molgat
8dd0f4e557 Even with MSVC enable zlib support as default behaviour. 2018-02-01 20:31:36 +01:00
Corentin Le Molgat
f7a05844eb Add CMake ALIAS targets 
We follow the findProtobuf.cmake naming convention
to ease the use of protobuf as cmake subproject
 2018-02-01 20:31:36 +01:00
Corentin Le Molgat
3bc0282fb6 Add VERSION property to CMake library targets 2018-02-01 20:31:36 +01:00
Ben Boeckel
9d0a44c9de cmake: privately add sources to targets 
Public sources get added to dependencies of the target as well which can
cause duplicate symbols.
 2018-01-19 12:05:00 -05:00
Adam Cozzette
609d752650 Ran update_file_lists.sh to update Bazel and CMake file lists 
This should fix Bazel builds, since those were missing a new file
(implicit_weak_message.cc).
 2017-12-07 14:16:50 -08:00
Adam Cozzette
0ba8eea655 Merge branch 'master' into down-integrate 2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
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