aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* CMakeLists for Cross-compilingHao Chen2020-02-051-0/+1
* Update extract_includes.bat.injjinglover2019-07-011-1/+1
* Fix RPATH when CMAKE_INSTALL_LIBDIR != lib.Carlos O'Ryan2019-06-051-1/+1
* Down integrate to GitHubHao Nguyen2019-05-032-2/+3
* Merge branch 'master' of https://github.com/protocolbuffers/protobuf into syn...Hao Nguyen2019-04-092-2/+2
|\
| * Revert accidentally commitHao Nguyen2019-04-052-2/+2
| * Merge branch 'master' of https://github.com/protocolbuffers/protobufHao Nguyen2019-04-052-2/+2
| |\
| | * Update file list for protobuf_litePhillipp Schoppmann2019-04-012-2/+1
| | * Merge branch '3.7.x' into merge-3-7-xAdam Cozzette2019-03-261-0/+1
| | |\
| | | * Added io_win32.h to header list in CMake configAdam Cozzette2019-03-211-0/+1
| * | | Down integrate to GithubHao Nguyen2019-04-052-2/+2
| |/ /
* / / Down integrate to GithubHao Nguyen2019-04-092-2/+2
|/ /
* | Fix CMake conflictHao Nguyen2019-03-201-13/+0
* | Down integrate to GithubHao Nguyen2019-03-202-1/+13
* | Merge branch '3.7.x'Bo Yang2019-03-044-6/+12
|\|
| * Add several fixes for python toolchain (#5667)Paul Yang2019-02-012-5/+10
| * Merge branch 'master' into 3.7.xBo Yang2019-01-234-4/+8
| |\
| * | Ran ./update_file_lists.sh to update CMake configurationAdam Cozzette2018-12-102-1/+4
* | | Merge branch 'master' into integrationYilun Chong2019-02-243-9/+9
|\ \ \
| * | | delete all duplicate empty blanks (#5758)Xiang Dai2019-02-203-9/+9
* | | | down integration from internalYilun Chong2019-02-221-0/+1
|/ / /
* | / Swapped libprotoc and libprotobufMichael Matthew Mitchell2019-01-311-1/+1
| |/ |/|
* | Down-integrate internal changes to github. (#5555)Yilun Chong2019-01-081-1/+0
* | Merge pull request #5489 from aaron-bray/masterAdam Cozzette2018-12-212-2/+2
|\ \
| * | Add strtod to libprotobuf-liteAaron Bray2018-12-202-2/+2
* | | Down-integrate internal changes (#5467)Paul Yang2018-12-142-1/+5
* | | Merge pull request #5396 from hesmar/hesmar/fixCmakeInstallHeaderJoshua Haberman2018-12-101-0/+1
|\ \ \
| * | | Windows: install missing headersMarkus Heß2018-12-051-0/+2
| | |/ | |/|
* / | fix: cmake installAbdel Younes2018-12-101-0/+2
|/ /
* | Updated README.md (#5366)dyyap2018-11-151-0/+7
* | Integrated internal changes from GoogleAdam Cozzette2018-11-091-1/+0
|/
* Revert "protobuf_generate(): add relative path to output dir"Markus Heß2018-09-281-1/+1
* Added conformance test impl file to CMake.Joshua Haberman2018-09-021-0/+1
* Merge pull request #5078 from haberman/conformance-cmakeJoshua Haberman2018-09-022-0/+52
|\
| * Added cmake build files for the conformance test runner.Josh Haberman2018-08-242-0/+52
* | Replace repo links.Feng Xiao2018-08-221-2/+2
* | Update build files.Feng Xiao2018-08-132-0/+4
* | Merge master branch.Feng Xiao2018-08-081-0/+7
|\|
| * tests: fix link failure and stack overflow on Mingw w64Roman Popov2018-07-301-0/+7
* | Down-integrate from google3.Feng Xiao2018-08-082-0/+5
|/
* Delete unused files. (#4942)Feng Xiao2018-07-191-4/+0
* protobuf_generate(): add relative path to output dirMarkus Heß2018-07-101-1/+1
* Fixed protobuf_generate output definition for files relative to the protobuf_...Steffen Wittmeier2018-06-251-1/+3
* Remove js_embed binary. (#4709)Feng Xiao2018-06-011-12/+0
* CMake OSX rpath management (#4620)Mizux2018-05-222-1/+19
* Merge pull request #4619 from ccvca/cmake_protobuf_generate_changesFeng Xiao2018-05-171-8/+12
|\
| * cmake: Fix DEPENDS of add_custom_command in protobuf_generateChristian von Arnim2018-05-151-1/+1
| * cmake: Add parameter PROTOC_OUT_DIR to protobuf_generateChristian von Arnim2018-05-141-3/+7
| * cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generateChristian von Arnim2018-05-141-4/+4
* | Fix issue with version.rcIvan Shynkarenka2018-05-154-0/+8