aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmake
Commit message (Collapse)AuthorAge
* Fix bugs on windowsGravatar Bo Yang2015-08-25
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
|
* Down-integrate from google3.Gravatar Feng Xiao2015-08-22
|
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2015-08-21
|\ | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525
* | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
| * Merge pull request #673 from podsvirov/topic-cmake-installGravatar Feng Xiao2015-08-12
| |\ | | | | | | Install protobuf from cmake project
| * | only link runtime libraries statically for a static buildGravatar Jan Tattermusch2015-08-12
| | |
| * | make VS build link runtime staticallyGravatar Jan Tattermusch2015-08-08
| | |
| | * Install headers from extract_includes for all platformsGravatar Konstantin Podsvirov2015-08-04
| | |
| * | Merge pull request #653 from airtimemedia/masterGravatar Feng Xiao2015-08-03
| |\ \ | | | | | | | | Various compilation fixes
| | | * Fix: comment typoGravatar Konstantin Podsvirov2015-08-03
| | | |
| | | * Install well-known type proto files from CMake projectGravatar Konstantin Podsvirov2015-08-03
| | | |
| | | * CMake installation now compatible with origin FindProtobuf moduleGravatar Konstantin Podsvirov2015-08-02
| | | |
| | | * Parsing version from configure.ac for CMake projectGravatar Konstantin Podsvirov2015-08-01
| | | |
| | | * Install protobuf from cmake projectGravatar Konstantin Podsvirov2015-07-31
| | |/ | |/| | | | | | | | | | Additional export as "protobuf" package for importing from other cmake projects
| | * Set cmake include directories on library targets.Gravatar Tom Hughes2015-07-28
| |/ |/| | | | | | | cmake targets that depend on these libraries will automatically have these include directories.
| * Merge pull request #629 from google/masterGravatar Jon Skeet2015-07-21
| |\ | |/ |/| Integrate changes from upstream/master into csharp-experimental
* | update header list.Gravatar Jisi Liu2015-07-17
| | | | | | | | Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
* | Update make file for extra headers.Gravatar Jisi Liu2015-07-17
| | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
| * Merge pull request #611 from jskeet/csharp-wrappersGravatar Jon Skeet2015-07-17
| |\ | | | | | | C# wrapper types
| * \ Merge pull request #586 from jtattermusch/csharp_names_exportGravatar Jan Tattermusch2015-07-16
| |\ \ | | | | | | | | Export c# naming routines publicly
| | | * First part of implementing wrapper types. Not ready yet!Gravatar Jon Skeet2015-07-16
| | |/ | |/|
| * | Merge remote-tracking branch 'upstream/master' into csharp-experimentalGravatar Jan Tattermusch2015-07-15
| |\ \ | |/ / |/| |
* | | remove pbconfig from extract scriptGravatar Jisi Liu2015-07-13
| | | | | | | | | | | | Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
| | * export c# naming routines publiclyGravatar Jan Tattermusch2015-07-10
| |/
| * First pass at map support.Gravatar Jon Skeet2015-06-25
| | | | | | | | More tests required. Generated code in next commit.
* | fix typo in cmake/README.mdGravatar Jan Tattermusch2015-06-24
| |
| * Merge remote-tracking branch 'upstream/master' into proto3-onlyGravatar Jon Skeet2015-06-19
| |\ | |/ |/|
* | Merge pull request #505 from pherl/bazelGravatar Jisi Liu2015-06-18
|\ \ | | | | | | Add bazel support for the project
| * | Move cmake/update_file_lists.sh preparing for bazel support.Gravatar Jisi Liu2015-06-17
| | | | | | | | | | | | Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
* | | Merge pull request #501 from xfxyjwf/downGravatar Feng Xiao2015-06-17
|\ \ \ | |/ / |/| | Down-integrate from internal code base.
| * | Fix broken builds.Gravatar Feng Xiao2015-06-17
| | |
| | * Updates to handle use of cmake for Windows builds.Gravatar Jon Skeet2015-06-17
| |/ |/|
* | Make the code independent of config.hGravatar Jisi Liu2015-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Down-integrate from internal code base.Gravatar Feng Xiao2015-06-15
|/ | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
* Merge pull request #481 from Qartar/masterGravatar Feng Xiao2015-06-12
|\ | | | | Workaround for MSVC's string literal compiler limit.
| * Workaround for MSVC's string literal compiler limit.Gravatar Qartar2015-06-12
| | | | | | | | | | | | | | | | | | | | 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.
* | Remove vsprojects.Gravatar Feng Xiao2015-06-05
|/
* Update ./update_file_lists.sh.Gravatar Feng Xiao2015-06-05
| | | | Make it executable and generate extract_includes.bat in the same directory.
* Add back incorrectly excluded cmake targets.Gravatar Feng Xiao2015-06-05
|
* Fix README.md formatting.Gravatar Feng Xiao2015-06-04
| | | | Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b
* Add an cmake option to exclude tests.Gravatar Feng Xiao2015-06-04
|
* Add cmake support.Gravatar Feng Xiao2015-05-31