aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #4579 from jozefizso/dev/3380_version_infoFeng Xiao2018-05-146-4/+79
|\ \
| * | Include file information in all DLL and EXE outputsJozef Izso2018-04-284-5/+20
| * | Add file information to Windows binariesJozef Izso2018-04-274-3/+63
* | | Merge pull request #4587 from chronoxor/masterFeng Xiao2018-05-141-0/+4
|\ \ \ | |_|/ |/| |
| * | Appveyor MinGW buildIvan Shynkarenka2018-05-031-0/+4
* | | Merge pull request #4538 from Mizux/patch-2Feng Xiao2018-05-101-0/+12
|\ \ \ | |/ / |/| |
| * | fix duplicate mkdir in update_file_lists.shCorentin Le Molgat2018-04-251-3/+0
| * | Add .proto files to extract_includes.batMizux2018-04-241-0/+15
* | | Cygwin build failedIvan Shynkarenka2018-05-021-4/+8
| |/ |/|
* | CMake: Update CXX Standard managementCorentin Le Molgat2018-04-241-3/+5
|/
* Fix problem: cmake build failed in c++11 by clangSilver Chan2018-04-041-0/+3
* Merge pull request #4467 from xfxyjwf/errorFeng Xiao2018-04-021-1/+6
|\
| * Improve error message when googletest is missing.Feng Xiao2018-04-021-1/+6
* | Update instructions about getting protobuf source.Feng Xiao2018-03-291-6/+14
|/
* Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-262-24/+15
* Remove javanano.Feng Xiao2018-03-263-48/+7
* Removed some unused C++ source filesAdam Cozzette2018-03-222-3/+2
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-0/+5
|\
| * Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Feng Xiao2018-03-012-1/+1
| * Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.John Millikin2018-02-242-1/+1
| * Added instruction for existing ZLIB configurationAbdul Sami2018-02-211-0/+5
* | Integrated internal changes from GoogleAdam Cozzette2018-03-133-23/+2
|/
* Merge pull request #4259 from Mizux/masterFeng Xiao2018-02-025-5/+12
|\
| * Use NEW behaviour for project VERSION variables.Corentin Le Molgat2018-02-011-0/+4
| * Even with MSVC enable zlib support as default behaviour.Corentin Le Molgat2018-02-011-5/+1
| * Add CMake ALIAS targetsCorentin Le Molgat2018-02-014-0/+4
| * Add VERSION property to CMake library targetsCorentin Le Molgat2018-02-013-0/+3
* | cmake: privately add sources to targetsBen Boeckel2018-01-191-1/+1
|/
* Ran update_file_lists.sh to update Bazel and CMake file listsAdam Cozzette2017-12-071-0/+1
* Merge branch 'master' into down-integrateAdam Cozzette2017-12-013-13/+27
|\
| * Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-301-1/+0
| |\
| | * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-081-1/+0