Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tests: fix link failure and stack overflow on Mingw w64 | Roman Popov | 2018-07-30 | 1 | -0/+7 |
| | |||||
* | Delete unused files. (#4942) | Feng Xiao | 2018-07-19 | 1 | -4/+0 |
| | | | * Delete unused files. | ||||
* | protobuf_generate(): add relative path to output dir | Markus Heß | 2018-07-10 | 1 | -1/+1 |
| | | | | | | | Without this fix, protobuf_generate() sets the variable _generated_srcs to ${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext} but generates the files in ${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext} | ||||
* | Fixed protobuf_generate output definition for files relative to the ↵ | Steffen Wittmeier | 2018-06-25 | 1 | -1/+3 |
| | | | | protobuf_generate command | ||||
* | Remove js_embed binary. (#4709) | Feng Xiao | 2018-06-01 | 1 | -12/+0 |
| | | | | * Remove js_embed binary. | ||||
* | CMake OSX rpath management (#4620) | Mizux | 2018-05-22 | 2 | -1/+19 |
| | | | | | | | | | | | | | | * CMake: Add comment for CMP0048 * CMake: osx use @rpath/ as target's install name (CMP0042) On MacoS library should use @rpath/ as prefix path instead of absolute build path e.g. otool -L libprotobuf.dylib libprotobuf.dylib: @rpath/libprotobuf.dylib (...) ... * CMake: add rpath to target for LINUX and APPLE | ||||
* | Merge pull request #4619 from ccvca/cmake_protobuf_generate_changes | Feng Xiao | 2018-05-17 | 1 | -8/+12 |
|\ | | | | | cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR | ||||
| * | cmake: Fix DEPENDS of add_custom_command in protobuf_generate | Christian von Arnim | 2018-05-15 | 1 | -1/+1 |
| | | |||||
| * | cmake: Add parameter PROTOC_OUT_DIR to protobuf_generate | Christian von Arnim | 2018-05-14 | 1 | -3/+7 |
| | | |||||
| * | cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generate | Christian von Arnim | 2018-05-14 | 1 | -4/+4 |
| | | |||||
* | | Fix issue with version.rc | Ivan Shynkarenka | 2018-05-15 | 4 | -0/+8 |
| | | |||||
* | | Merge pull request #4579 from jozefizso/dev/3380_version_info | Feng Xiao | 2018-05-14 | 6 | -4/+79 |
|\ \ | | | | | | | Include version information in Windows binaries #3380 | ||||
| * | | Include file information in all DLL and EXE outputs | Jozef Izso | 2018-04-28 | 4 | -5/+20 |
| | | | |||||
| * | | Add file information to Windows binaries | Jozef Izso | 2018-04-27 | 4 | -3/+63 |
| | | | |||||
* | | | Merge pull request #4587 from chronoxor/master | Feng Xiao | 2018-05-14 | 1 | -0/+4 |
|\ \ \ | |_|/ |/| | | Appveyor MinGW build | ||||
| * | | Appveyor MinGW build | Ivan Shynkarenka | 2018-05-03 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #4538 from Mizux/patch-2 | Feng Xiao | 2018-05-10 | 1 | -0/+12 |
|\ \ \ | |/ / |/| | | Add .proto files to extract_includes.bat | ||||
| * | | fix duplicate mkdir in update_file_lists.sh | Corentin Le Molgat | 2018-04-25 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | - merge loop for .h and .proto includes - fix shellcheck errors | ||||
| * | | Add .proto files to extract_includes.bat | Mizux | 2018-04-24 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | For google/or-tools, on windows, we need to use `import "google/protobuf/wrappers.proto";` since we want "optional" int64 and in version3 POD get default value... -> so we use "google.protobuf.Int64Value" since 0 is a valid value and different from "not set" for our use case. | ||||
* | | | Cygwin build failed | Ivan Shynkarenka | 2018-05-02 | 1 | -4/+8 |
| |/ |/| | |||||
* | | CMake: Update CXX Standard management | Corentin Le Molgat | 2018-04-24 | 1 | -3/+5 |
|/ | |||||
* | Fix problem: cmake build failed in c++11 by clang | Silver Chan | 2018-04-04 | 1 | -0/+3 |
| | | | CMakeLists.txt adds c++11 flags for clang | ||||
* | Merge pull request #4467 from xfxyjwf/error | Feng Xiao | 2018-04-02 | 1 | -1/+6 |
|\ | | | | | Improve error message when googletest is missing. | ||||
| * | Improve error message when googletest is missing. | Feng Xiao | 2018-04-02 | 1 | -1/+6 |
| | | |||||
* | | Update instructions about getting protobuf source. | Feng Xiao | 2018-03-29 | 1 | -6/+14 |
|/ | |||||
* | Include googletest as a submodule (#3993) | Carlos O'Ryan | 2018-03-26 | 2 | -24/+15 |
| | | | Add googletest as a submodule in third_party/googletest. | ||||
* | Remove javanano. | Feng Xiao | 2018-03-26 | 3 | -48/+7 |
| | |||||
* | Removed some unused C++ source files | Adam Cozzette | 2018-03-22 | 2 | -3/+2 |
| | |||||
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 1 | -0/+5 |
|\ | |||||
| * | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources." | Feng Xiao | 2018-03-01 | 2 | -1/+1 |
| | | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c. | ||||
| * | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources. | John Millikin | 2018-02-24 | 2 | -1/+1 |
| | | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting. | ||||
| * | Added instruction for existing ZLIB configuration | Abdul Sami | 2018-02-21 | 1 | -0/+5 |
| | | | | | | Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system | ||||
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 3 | -23/+2 |
|/ | |||||
* | Merge pull request #4259 from Mizux/master | Feng Xiao | 2018-02-02 | 5 | -5/+12 |
|\ | | | | | Various CMake Update | ||||
| * | Use NEW behaviour for project VERSION variables. | Corentin Le Molgat | 2018-02-01 | 1 | -0/+4 |
| | | | | | | | | cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048 | ||||
| * | Even with MSVC enable zlib support as default behaviour. | Corentin Le Molgat | 2018-02-01 | 1 | -5/+1 |
| | | |||||
| * | Add CMake ALIAS targets | Corentin Le Molgat | 2018-02-01 | 4 | -0/+4 |
| | | | | | | | | | | We follow the findProtobuf.cmake naming convention to ease the use of protobuf as cmake subproject | ||||
| * | Add VERSION property to CMake library targets | Corentin Le Molgat | 2018-02-01 | 3 | -0/+3 |
| | | |||||
* | | cmake: privately add sources to targets | Ben Boeckel | 2018-01-19 | 1 | -1/+1 |
|/ | | | | | Public sources get added to dependencies of the target as well which can cause duplicate symbols. | ||||
* | Ran update_file_lists.sh to update Bazel and CMake file lists | Adam Cozzette | 2017-12-07 | 1 | -0/+1 |
| | | | | | This should fix Bazel builds, since those were missing a new file (implicit_weak_message.cc). | ||||
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 3 | -13/+27 |
|\ | |||||
| * | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 1 | -1/+0 |
| |\ | |||||
| | * | Fix Atomic32/AtomicWord on some platforms. | Jisi Liu | 2017-11-08 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms. | ||||
| * | | Allow one to omit building libprotoc and protoc binaries | Yangqing Jia | 2017-11-13 | 2 | -12/+27 |
| |/ | |||||
* / | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #3722 from timou/cmake-windows-clean | Jisi Liu | 2017-10-27 | 1 | -1/+20 |
|\ | | | | | Suppress VS2017 compiler/linker warnings | ||||
| * | Sort MSVC warning suppressions | Tim Ebringer | 2017-10-21 | 1 | -1/+17 |
| | | | | | | | | Add brief documentation describing each warning suppression. | ||||
| * | Suppress VS2017 compiler/linker warnings | Tim Ebringer | 2017-10-06 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | VS2017 warns about a few additional things, for example, files that define no symbols (which is typically the result of a platform specific ifdef not applying on Windows). Suppress these warnings so the build is clean on VS2017. | ||||
* | | Merge pull request #3770 from pherl/3.5-integrate | Jisi Liu | 2017-10-19 | 1 | -0/+1 |
|\ \ | | | | | | | Integrate google internal changes for the up coming 3.5 release. | ||||
| * | | Merge from google internal | Jisi Liu | 2017-10-18 | 1 | -0/+1 |
| |/ |