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

290 Commits

Author SHA1 Message Date
Walter Gray
09f6a5c1d2 Use ExternalProject_Add to build the examples in a stand-alone fashion. 2016-06-06 12:06:55 -07:00
Konstantin Podsvirov
71556295ff CMake project updates 
A series of improvements:

- Improved Protobuf module compatibility (disabled by default);
- Hide advanced settings;
- Added build tree configuration;
- Added build of examples.
 2016-06-04 00:10:07 +03:00
Bo Yang
20b532544f Integrate interanl changes 2016-06-02 15:44:32 -07:00
Walter Gray
0420eab173 For prerelease versions, require protobuf_FIND_VERSION to be set. 2016-05-31 17:47:18 -07:00
Walter Gray
f1091ab1aa Include the prerelease version in the protobuf_VERSION 2016-05-31 17:07:41 -07:00
Feng Xiao
cc30be105c Merge pull request #1613 from yeswalrus/cmake-min-version 
Bump cmake minimum required version to 2.8.12
 2016-05-31 18:35:28 -04:00
Walter Gray
457a2975f4 Remove __PROTOBUF_PACKAGE_PREFIX 2016-05-28 01:59:58 -07:00
Walter Gray
d13b3d0d96 remove useless cleanup - config.cmake files are executed in their own context. 2016-05-26 23:49:28 -07:00
Walter Gray
c57c6eabf7 Bump to the *real* minimum required version. Setting CMP0022 breaks CMake versions < 2.8.12 2016-05-26 23:39:17 -07:00
Walter Gray
04265e40da Remove if(TRUE) 2016-05-26 18:05:58 -07:00
Jeff Merver
733ef986e5 added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88 2016-05-21 16:01:32 -07:00
Walter Gray
28f35b4f16 add protobuf:: namespace to installed targets 2016-05-20 18:03:32 -07:00
Feng Xiao
2338e03570 Merge pull request #1576 from wal-rus/cmake-versionfile 
Make protobuf-config-version.cmake.in set the required variables
 2016-05-20 11:50:00 -07:00
Walter Gray
02a28a8fea Update protobuf-config-version.cmake.in to correctly set the required variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE) 2016-05-19 15:25:03 -07:00
Walter Gray
7d79458fc5 Fix the cmake configuration file install path to be more standards compliant (See the description of cmake's config search behavior on https://cmake.org/cmake/help/v3.4/command/find_package.html) 2016-05-19 14:52:04 -07:00
Jisi Liu
f86d39c295 Update file lists. 2016-04-28 14:43:22 -07:00
Jisi Liu
1f4f3e26bd Update file list to include the missing extension lite file. 2016-04-18 14:12:08 -07:00
Josh Haberman
4465daa57a Merge branch 'master' into internal-merge 2016-04-07 14:10:19 -07:00
Gaurav Vaish
74d8b0bebc Added access_level for types 
* `csharp_options`: Added `Options` to encapsulate generator options.
   Supported options for now - file_extension, base_namespace
* `{Blah}Generator`: Now accept `Options*` as parameter to constructor
* `csharp_generator.cc`: Parse and populate options
* `Makefile.am`: Added `csharp_options.h`
* `extract_includes.bat.in`: Added `csharp_options.h`

Refactoring code to two commits. This is the first commit
 2016-04-05 09:47:11 -07:00
Jisi Liu
3b6df0612d Allow bigobj for map_unittest 2016-04-01 15:02:45 -07:00
Josh Haberman
fe96a215d9 Clarified that 'nmake' must be run before 'nmake check'. 2016-02-10 14:44:29 -08:00
Jisi Liu
5221dcbe47 Integrate from google internal. 
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
 2016-01-29 13:51:05 -08:00
Dongjoon Hyun
7b08d49e9d Fix typos in README.md/CHANGES.txt 2016-01-11 14:52:01 -08:00
Feng Xiao
ef6c72b46b Update BUILD/cmake files. 
Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d
 2015-12-28 17:33:55 -08:00
Feng Xiao
d217808417 Merge branch master into v3.0.0-beta-2 2015-12-21 00:34:19 -08:00
Feng Xiao
e841bac4fc Down-integrate from internal code base. 2015-12-11 17:10:28 -08:00
Benjamin Bennett
9fc4d90cab MSVC MP flag to build with multiple processes in visual studio. 2015-12-07 13:54:02 -06:00
Jon Skeet
a6361a124a Rename "umbrella" to "reflection" consistently. 
This changes csharp_names.h, which will require a corresponding change in GRPC.
 2015-11-19 13:05:17 +00:00
Doug Kwan
2a50e67c78 Add support for POWER Linux 2015-11-03 14:49:42 -08:00
Feng Xiao
70b81ba10d Merge pull request #889 from leif81/patch-1 
Fix typos in cmake README.md
 2015-10-16 16:57:36 -07:00
Leif Gruenwoldt
a9e6a8f61d Change back to "protobuf_BUILD_TESTS" flag 
In anticipation of PR #753 getting merged we'll change this back. However until that PR gets merged the old value "BUILD_TESTS" is really needed.
 2015-10-16 19:53:21 -04:00
Feng Xiao
5314ad1b21 Merge pull request #783 from podsvirov/topic-cmake-project 
Improved CMake project
 2015-10-16 14:08:38 -07:00
Leif Gruenwoldt
24e2d8c2f1 Fix typos in cmake README.md 2015-10-16 15:53:23 -04:00
Konstantin Podsvirov
c3aa4c2675 Improved SHARED build from CMake project 2015-10-15 02:56:48 +03:00
Konstantin Podsvirov
0f21c538be Update cmake/README.md for #783 PR 2015-10-09 10:46:53 +03:00
Jon Skeet
67dd42c50d First pass at generating XML documentation from .proto comments. 
This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing.

Generated code changes coming in next commit.
 2015-10-01 10:36:58 +01:00
Konstantin Podsvirov
f397ede7c6 Add CMake option protobuf_DEBUG_POSTFIX 2015-09-17 13:00:12 +03:00
Konstantin Podsvirov
e301946ca4 Simplify testing from CMake project to "check" target 2015-09-17 12:08:47 +03:00
Konstantin Podsvirov
d41601c249 Improved testing from CMake project 
Build tests optimization
Now lite-test added to CTest collection
 2015-09-16 12:55:35 +03:00
Konstantin Podsvirov
0a22fe59b7 Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS 2015-09-15 15:36:20 +03:00
Konstantin Podsvirov
620bd7418d Rename CMake option ZLIB to protobuf_WITH_ZLIB 2015-09-15 15:31:25 +03:00
Konstantin Podsvirov
673d32e093 Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS 2015-09-15 15:30:02 +03:00
Konstantin Podsvirov
2fa0439b00 Improved testing from CMake project 2015-09-15 15:01:05 +03:00
Konstantin Podsvirov
905f464035 Using NEW behavior for CMP0022 in CMake project 2015-09-01 16:44:48 +03:00
Konstantin Podsvirov
d79e0379f2 Option for switching static runtime link policy with MSVC 2015-09-01 15:00:00 +03:00
Konstantin Podsvirov
20b882d469 Using find_package(ZLIB) with MSVC too 2015-08-31 16:23:40 +03:00
Konstantin Podsvirov
db01460042 Improved configure.ac parsing 2015-08-31 15:20:18 +03:00
Bo Yang
ff7bdad231 Fix bugs on windows 2015-08-25 17:58:48 -07:00
Feng Xiao
b17ec3ca11 Down-integrate from internal code base. 2015-08-23 17:50:38 -07:00
Feng Xiao
eee38b0c01 Down-integrate from google3. 2015-08-22 18:25:48 -07:00
Jisi Liu
c3bc155ace Merge branch 'master' of github.com:google/protobuf 
Change-Id: If3fb07754a734bae610d95124528e073515ac525
 2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d Down-integrate from internal branch. 
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
 2015-08-21 11:18:45 -07:00
Feng Xiao
f818183f9b Merge pull request #673 from podsvirov/topic-cmake-install 
Install protobuf from cmake project
 2015-08-12 23:07:54 -07:00
Jan Tattermusch
9bdeba479b only link runtime libraries statically for a static build 2015-08-12 12:47:02 -07:00
Jan Tattermusch
1858ac9b42 make VS build link runtime statically 2015-08-08 19:56:52 -07:00
Konstantin Podsvirov
61e078e803 Install headers from extract_includes for all platforms 2015-08-04 10:32:58 +03:00
Feng Xiao
dc80689af3 Merge pull request #653 from airtimemedia/master 
Various compilation fixes
 2015-08-03 10:19:32 -07:00
Konstantin Podsvirov
5500b0691f Fix: comment typo 2015-08-03 12:10:55 +03:00
Konstantin Podsvirov
ebfca175e2 Install well-known type proto files from CMake project 2015-08-03 11:58:48 +03:00
Konstantin Podsvirov
0be0789018 CMake installation now compatible with origin FindProtobuf module 2015-08-02 16:31:28 +03:00
Konstantin Podsvirov
743ec448c5 Parsing version from configure.ac for CMake project 2015-08-01 02:01:42 +03:00
Konstantin Podsvirov
82983433cf Install protobuf from cmake project 
Additional export as "protobuf" package
for importing from other cmake projects
 2015-07-31 23:36:00 +03:00
Tom Hughes
6d72d12575 Set cmake include directories on library targets. 
cmake targets that depend on these libraries will automatically have
these include directories.
 2015-07-28 16:18:35 -07:00
Jon Skeet
2ee4b56655 Merge pull request #629 from google/master 
Integrate changes from upstream/master into csharp-experimental
 2015-07-21 12:58:43 +01:00
Jisi Liu
12f6e3dd0e update header list. 
Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
 2015-07-17 11:36:51 -07:00
Jisi Liu
7b216119ee Update make file for extra headers. 
Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
 2015-07-17 11:34:33 -07:00
Jon Skeet
0f442a7533 Merge pull request #611 from jskeet/csharp-wrappers 
C# wrapper types
 2015-07-17 07:29:50 +01:00
Jan Tattermusch
fa544f4835 Merge pull request #586 from jtattermusch/csharp_names_export 
Export c# naming routines publicly
 2015-07-16 17:33:56 -07:00
Jon Skeet
b2ac868493 First part of implementing wrapper types. Not ready yet! 2015-07-16 09:36:30 +01:00
Jan Tattermusch
11002e70c6 Merge remote-tracking branch 'upstream/master' into csharp-experimental 2015-07-15 20:33:59 -07:00
Jisi Liu
bd4bc9e72c remove pbconfig from extract script 
Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
 2015-07-13 10:41:18 -07:00
Jan Tattermusch
cacbedf04e export c# naming routines publicly 2015-07-10 13:40:34 -07:00
Jon Skeet
0d684d3420 First pass at map support. 
More tests required. Generated code in next commit.
 2015-06-25 09:39:28 +01:00
Jan Tattermusch
60161997c8 fix typo in cmake/README.md 2015-06-24 09:27:23 -07:00
Jon Skeet
50a3a809e8 Merge remote-tracking branch 'upstream/master' into proto3-only 2015-06-19 17:35:01 +01:00
Jisi Liu
1e534d7ac3 Merge pull request #505 from pherl/bazel 
Add bazel support for the project
 2015-06-18 11:19:34 -07:00
Jisi Liu
1c42a8b336 Move cmake/update_file_lists.sh preparing for bazel support. 
Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
 2015-06-17 13:31:26 -07:00
Feng Xiao
e9a122eb19 Merge pull request #501 from xfxyjwf/down 
Down-integrate from internal code base.
 2015-06-17 13:12:11 -07:00
Feng Xiao
818c5eee08 Fix broken builds. 2015-06-17 11:19:46 -07:00
Jon Skeet
09f3f4eec3 Updates to handle use of cmake for Windows builds. 2015-06-17 15:16:14 +01:00
Jisi Liu
78d470c7a5 Make the code independent of config.h 
Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather
than providing a config.h

- Make pbconfig.h a manually written file to handle hash conditions
  according to platform related macros.
- Remove #include "config.h" from source code.
- Changed the configure.ac and Makefile.am to pass down the macros.
- Change cmake to pass down the the macros.

Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
 2015-06-16 18:27:36 -07:00
Feng Xiao
e96ff30120 Down-integrate from internal code base. 
[ci skip]

Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
 2015-06-15 18:24:01 -07:00
Feng Xiao
54a4cccb97 Merge pull request #481 from Qartar/master 
Workaround for MSVC's string literal compiler limit.
 2015-06-12 14:56:02 -07:00
Qartar
2fe6d7bc57 Workaround for MSVC's string literal compiler limit. 
Escape characters don't count for string literal size, no need to pre-generate escape string.

Added unit test to touch enormous cpp generated descriptor.

Updated makefile to include enormous_descriptor.proto

Fixed language compatibility error.
 2015-06-12 13:23:09 -07:00
Feng Xiao
ee6b3d5529 Remove vsprojects. 2015-06-05 23:57:01 -07:00
Feng Xiao
dffd542bb8 Update ./update_file_lists.sh. 
Make it executable and generate extract_includes.bat in the same directory.
 2015-06-05 23:36:05 -07:00
Feng Xiao
e9839ff444 Add back incorrectly excluded cmake targets. 2015-06-05 21:24:23 -07:00
Feng Xiao
2286ab328c Fix README.md formatting. 
Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b
 2015-06-04 11:28:19 -07:00
Feng Xiao
34448fca45 Add an cmake option to exclude tests. 2015-06-04 01:27:19 -07:00
Feng Xiao
4333edb340 Add cmake support. 2015-05-31 02:28:34 -07:00