aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* Replace handwritten protobuf-targets with exported version.Walter Gray2016-06-063-39/+24
* Use ExternalProject_Add to build the examples in a stand-alone fashion.Walter Gray2016-06-061-2/+49
* CMake project updatesKonstantin Podsvirov2016-06-048-69/+233
* Integrate interanl changesBo Yang2016-06-021-0/+1
* Merge pull request #1613 from yeswalrus/cmake-min-versionFeng Xiao2016-05-311-1/+1
|\
| * Bump to the *real* minimum required version. Setting CMP0022 breaks CMake ver...Walter Gray2016-05-261-1/+1
* | Remove __PROTOBUF_PACKAGE_PREFIXWalter Gray2016-05-281-5/+1
* | remove useless cleanup - config.cmake files are executed in their own context.Walter Gray2016-05-261-4/+0
* | Remove if(TRUE)Walter Gray2016-05-261-28/+26
|/
* added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88Jeff Merver2016-05-211-1/+1
* add protobuf:: namespace to installed targetsWalter Gray2016-05-201-0/+1
* Merge pull request #1576 from wal-rus/cmake-versionfileFeng Xiao2016-05-201-0/+35
|\
| * Update protobuf-config-version.cmake.in to correctly set the required variabl...Walter Gray2016-05-191-0/+35
* | Fix the cmake configuration file install path to be more standards compliant ...Walter Gray2016-05-191-2/+8
|/
* Update file lists.Jisi Liu2016-04-281-0/+5
* Update file list to include the missing extension lite file.Jisi Liu2016-04-181-1/+0
* Merge branch 'master' into internal-mergeJosh Haberman2016-04-071-0/+1
|\
| * Added access_level for typesGaurav Vaish2016-04-051-0/+1
* | Allow bigobj for map_unittestJisi Liu2016-04-011-0/+2
|/
* 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
|\