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

201 Commits

Author SHA1 Message Date
Feng Xiao
143851ed25
Remove js_embed binary. (#4709) 
* Remove js_embed binary.
 2018-06-01 11:00:04 -07:00
Mizux
7306f549bf CMake OSX rpath management (#4620) 
* CMake: Add comment for CMP0048

* CMake: osx use @rpath/ as target's install name (CMP0042)

On MacoS library should use @rpath/ as prefix path instead of absolute build path
e.g. otool -L libprotobuf.dylib
libprotobuf.dylib:
  @rpath/libprotobuf.dylib (...)
  ...

* CMake: add rpath to target for LINUX and APPLE
 2018-05-22 12:52:07 -07:00
Feng Xiao
fb33d88ed1
Merge pull request #4619 from ccvca/cmake_protobuf_generate_changes 
cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR
 2018-05-17 10:17:57 -07:00
Ivan Shynkarenka
291d9a0ab0 Fix issue with version.rc 2018-05-15 23:19:58 +03:00
Christian von Arnim
411018e3fb
cmake: Fix DEPENDS of add_custom_command in protobuf_generate 2018-05-15 09:06:54 +02:00
Feng Xiao
ac34bf8f59
Merge pull request #4579 from jozefizso/dev/3380_version_info 
Include version information in Windows binaries #3380
 2018-05-14 13:47:28 -07:00
Feng Xiao
4600f789a2
Merge pull request #4587 from chronoxor/master 
Appveyor MinGW build
 2018-05-14 13:44:29 -07:00
Christian von Arnim
b9c0c5f526
cmake: Add parameter PROTOC_OUT_DIR to protobuf_generate 2018-05-14 09:22:34 +02:00
Christian von Arnim
e8ae76fbde
cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generate 2018-05-14 09:22:08 +02:00
Feng Xiao
2213c1c1f6
Merge pull request #4538 from Mizux/patch-2 
Add .proto files to extract_includes.bat
 2018-05-10 22:44:47 -07:00
Ivan Shynkarenka
feb183d895 Appveyor MinGW build 2018-05-03 03:17:19 +03:00
Ivan Shynkarenka
f80a886bc1 Cygwin build failed 2018-05-02 03:01:10 +03:00
Jozef Izso
b1fecd0dea Include file information in all DLL and EXE outputs 2018-04-28 00:12:38 +02:00
Jozef Izso
3415201d1d Add file information to Windows binaries 2018-04-27 23:44:38 +02:00
Corentin Le Molgat
2bd7f516e5 fix duplicate mkdir in update_file_lists.sh 
- merge loop for .h and .proto includes
- fix shellcheck errors
 2018-04-25 08:22:30 +02:00
Corentin Le Molgat
c3b152c7e0 CMake: Update CXX Standard management 2018-04-24 17:21:16 +02:00
Mizux
3ad8efc75b Add .proto files to extract_includes.bat 
For google/or-tools, on windows, we need to use `import "google/protobuf/wrappers.proto";` since we want "optional" int64 and in version3 POD get default value...
-> so we use "google.protobuf.Int64Value" since 0 is a valid value and different from "not set" for our use case.
 2018-04-24 13:55:54 +02:00
Silver Chan
d3e8a54020
Fix problem: cmake build failed in c++11 by clang 
CMakeLists.txt adds c++11 flags for clang
 2018-04-04 10:31:05 +08:00
Feng Xiao
40d6eca832
Merge pull request #4467 from xfxyjwf/error 
Improve error message when googletest is missing.
 2018-04-02 14:46:58 -07:00
Feng Xiao
8f88a507ee Improve error message when googletest is missing. 2018-04-02 14:28:25 -07:00
Feng Xiao
014e76e2cd Update instructions about getting protobuf source. 2018-03-29 13:14:00 -07:00
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