aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Clarified that 'nmake' must be run before 'nmake check'.Josh Haberman2016-02-101-1/+2
* Integrate from google internal.Jisi Liu2016-01-291-0/+1
* Fix typos in README.md/CHANGES.txtDongjoon Hyun2016-01-111-3/+3
* Update BUILD/cmake files.Feng Xiao2015-12-282-3/+5
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-211-0/+2
|\
| * MSVC MP flag to build with multiple processes in visual studio.Benjamin Bennett2015-12-071-0/+2
* | Down-integrate from internal code base.Feng Xiao2015-12-113-0/+4
|/
* Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-191-1/+1
* Add support for POWER LinuxDoug Kwan2015-11-031-1/+1
* Merge pull request #889 from leif81/patch-1Feng Xiao2015-10-161-10/+10
|\
| * Change back to "protobuf_BUILD_TESTS" flagLeif Gruenwoldt2015-10-161-1/+1
| * Fix typos in cmake README.mdLeif Gruenwoldt2015-10-161-11/+11
* | Merge pull request #783 from podsvirov/topic-cmake-projectFeng Xiao2015-10-165-52/+108
|\ \ | |/ |/|
| * Improved SHARED build from CMake projectKonstantin Podsvirov2015-10-154-27/+47
| * Add CMake option protobuf_DEBUG_POSTFIXKonstantin Podsvirov2015-09-174-3/+8
| * Simplify testing from CMake project to "check" targetKonstantin Podsvirov2015-09-171-19/+13
| * Improved testing from CMake projectKonstantin Podsvirov2015-09-161-4/+11
| * Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBSKonstantin Podsvirov2015-09-151-4/+4
| * Rename CMake option ZLIB to protobuf_WITH_ZLIBKonstantin Podsvirov2015-09-151-5/+5
| * Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTSKonstantin Podsvirov2015-09-151-3/+3
| * Improved testing from CMake projectKonstantin Podsvirov2015-09-151-3/+13
| * Using NEW behavior for CMP0022 in CMake projectKonstantin Podsvirov2015-09-011-0/+3
| * Option for switching static runtime link policy with MSVCKonstantin Podsvirov2015-09-011-7/+10
| * Using find_package(ZLIB) with MSVC tooKonstantin Podsvirov2015-08-311-12/+14
| * Improved configure.ac parsingKonstantin Podsvirov2015-08-311-15/+27
* | Update cmake/README.md for #783 PRKonstantin Podsvirov2015-10-091-76/+272
* | First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-011-0/+1
|/
* 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
| |\ \ \