aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)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
|\
| * Merge pull request #673 from podsvirov/topic-cmake-installFeng Xiao2015-08-125-0/+302
| |\
| | * 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
| * | 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
| |\ \ | | |/ | |/|
| | * Set cmake include directories on library targets.Tom Hughes2015-07-282-0/+2
| * | Merge pull request #629 from google/masterJon Skeet2015-07-211-0/+9
| |\|
| * | Merge pull request #611 from jskeet/csharp-wrappersJon Skeet2015-07-171-0/+1
| |\ \
| | * | 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 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
| * | | 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
| |_|_|/ |/| | |
* | | | update header list.Jisi Liu2015-07-171-0/+3
* | | | Update make file for extra headers.Jisi Liu2015-07-171-0/+6
| |_|/ |/| |
* | | remove pbconfig from extract scriptJisi Liu2015-07-131-1/+0
* | | fix typo in cmake/README.mdJan Tattermusch2015-06-241-1/+1
| |/ |/|
* | Merge pull request #505 from pherl/bazelJisi Liu2015-06-182-122/+0
|\ \
| * | Move cmake/update_file_lists.sh preparing for bazel support.Jisi Liu2015-06-172-122/+1
| |/
* | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-175-14/+77
|\ \ | |/ |/|
| * Fix broken builds.Feng Xiao2015-06-174-3/+12
| * Down-integrate from internal code base.Feng Xiao2015-06-155-14/+68
* | Make the code independent of config.hJisi Liu2015-06-164-139/+7
|/
* Merge pull request #481 from Qartar/masterFeng Xiao2015-06-121-0/+1
|\
| * Workaround for MSVC's string literal compiler limit.Qartar2015-06-121-0/+1
* | Remove vsprojects.Feng Xiao2015-06-051-12/+24
|/
* Update ./update_file_lists.sh.Feng Xiao2015-06-053-10/+127
* Add back incorrectly excluded cmake targets.Feng Xiao2015-06-051-1/+2
* Fix README.md formatting.Feng Xiao2015-06-041-34/+43
* Add an cmake option to exclude tests.Feng Xiao2015-06-041-2/+4
* Add cmake support.Feng Xiao2015-05-3111-0/+748