aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Fix bugs on windowsBo Yang2015-08-253-2/+1
|
* Down-integrate from internal code base.Feng Xiao2015-08-231-4/+13
|
* Down-integrate from google3.Feng Xiao2015-08-223-131/+131
|
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-219-2/+320
|\ | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525
| * Merge pull request #673 from podsvirov/topic-cmake-installFeng Xiao2015-08-125-0/+302
| |\ | | | | | | Install protobuf from cmake project
| | * Install headers from extract_includes for all platformsKonstantin Podsvirov2015-08-041-1/+1
| | |
| | * Fix: comment typoKonstantin Podsvirov2015-08-031-1/+1
| | |
| | * Install well-known type proto files from CMake projectKonstantin Podsvirov2015-08-032-3/+57
| | |
| | * CMake installation now compatible with origin FindProtobuf moduleKonstantin Podsvirov2015-08-023-2/+156
| | |
| | * Parsing version from configure.ac for CMake projectKonstantin Podsvirov2015-08-012-15/+24
| | |
| | * Install protobuf from cmake projectKonstantin Podsvirov2015-07-314-0/+85
| | | | | | | | | | | | | | | Additional export as "protobuf" package for importing from other cmake projects
| * | only link runtime libraries statically for a static buildJan Tattermusch2015-08-121-12/+13
| | |
| * | make VS build link runtime staticallyJan Tattermusch2015-08-081-0/+12
| | |
| * | Merge pull request #653 from airtimemedia/masterFeng Xiao2015-08-032-0/+2
| |\ \ | | |/ | |/| Various compilation fixes
| | * Set cmake include directories on library targets.Tom Hughes2015-07-282-0/+2
| | | | | | | | | | | | | | | cmake targets that depend on these libraries will automatically have these include directories.
| * | Merge pull request #629 from google/masterJon Skeet2015-07-211-0/+9
| |\| | | | | | | Integrate changes from upstream/master into csharp-experimental
| * | Merge pull request #611 from jskeet/csharp-wrappersJon Skeet2015-07-171-0/+1
| |\ \ | | | | | | | | C# wrapper types
| | * | First part of implementing wrapper types. Not ready yet!Jon Skeet2015-07-161-0/+1
| | | |
| * | | Merge pull request #586 from jtattermusch/csharp_names_exportJan Tattermusch2015-07-161-0/+1
| |\ \ \ | | |/ / | |/| | Export c# naming routines publicly
| | * | export c# naming routines publiclyJan Tattermusch2015-07-101-0/+1
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into csharp-experimentalJan Tattermusch2015-07-152-2/+1
| |\ \ \ | | |/ / | |/| |
| * | | First pass at map support.Jon Skeet2015-06-251-0/+1
| | | | | | | | | | | | | | | | More tests required. Generated code in next commit.
| * | | Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-196-136/+77
| |\ \ \
| * | | | Updates to handle use of cmake for Windows builds.Jon Skeet2015-06-171-2/+0
| | | | |
* | | | | Down-integrate from internal branch.Jisi Liu2015-08-215-0/+12
| |_|_|/ |/| | | | | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
* | | | update header list.Jisi Liu2015-07-171-0/+3
| | | | | | | | | | | | | | | | Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
* | | | Update make file for extra headers.Jisi Liu2015-07-171-0/+6
| |_|/ |/| | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
* | | remove pbconfig from extract scriptJisi Liu2015-07-131-1/+0
| | | | | | | | | | | | Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
* | | fix typo in cmake/README.mdJan Tattermusch2015-06-241-1/+1
| |/ |/|
* | Merge pull request #505 from pherl/bazelJisi Liu2015-06-182-122/+0
|\ \ | | | | | | Add bazel support for the project
| * | Move cmake/update_file_lists.sh preparing for bazel support.Jisi Liu2015-06-172-122/+1
| |/ | | | | | | Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
* | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-175-14/+77
|\ \ | |/ |/| Down-integrate from internal code base.
| * Fix broken builds.Feng Xiao2015-06-174-3/+12
| |
| * Down-integrate from internal code base.Feng Xiao2015-06-155-14/+68
| | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
* | Make the code independent of config.hJisi Liu2015-06-164-139/+7
|/ | | | | | | | | | | | | 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
* Merge pull request #481 from Qartar/masterFeng Xiao2015-06-121-0/+1
|\ | | | | Workaround for MSVC's string literal compiler limit.
| * Workaround for MSVC's string literal compiler limit.Qartar2015-06-121-0/+1
| | | | | | | | | | | | | | | | | | | | 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.Feng Xiao2015-06-051-12/+24
|/
* Update ./update_file_lists.sh.Feng Xiao2015-06-053-10/+127
| | | | Make it executable and generate extract_includes.bat in the same directory.
* Add back incorrectly excluded cmake targets.Feng Xiao2015-06-051-1/+2
|
* Fix README.md formatting.Feng Xiao2015-06-041-34/+43
| | | | Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b
* Add an cmake option to exclude tests.Feng Xiao2015-06-041-2/+4
|
* Add cmake support.Feng Xiao2015-05-3111-0/+748
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 12:06:35 +0000