aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmake
Commit message (Collapse)AuthorAge
* Fixed protobuf_generate output definition for files relative to the ↵Gravatar Steffen Wittmeier2018-06-25
| | | | protobuf_generate command
* Remove js_embed binary. (#4709)Gravatar Feng Xiao2018-06-01
| | | | * Remove js_embed binary.
* CMake OSX rpath management (#4620)Gravatar Mizux2018-05-22
| | | | | | | | | | | | | | * 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_changesGravatar Feng Xiao2018-05-17
|\ | | | | cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR
* | Fix issue with version.rcGravatar Ivan Shynkarenka2018-05-15
| |
| * cmake: Fix DEPENDS of add_custom_command in protobuf_generateGravatar Christian von Arnim2018-05-15
| |
* | Merge pull request #4579 from jozefizso/dev/3380_version_infoGravatar Feng Xiao2018-05-14
|\ \ | | | | | | Include version information in Windows binaries #3380
* \ \ Merge pull request #4587 from chronoxor/masterGravatar Feng Xiao2018-05-14
|\ \ \ | | | | | | | | Appveyor MinGW build
| | | * cmake: Add parameter PROTOC_OUT_DIR to protobuf_generateGravatar Christian von Arnim2018-05-14
| | | |
| | | * cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generateGravatar Christian von Arnim2018-05-14
| |_|/ |/| |
* | | Merge pull request #4538 from Mizux/patch-2Gravatar Feng Xiao2018-05-10
|\ \ \ | | | | | | | | Add .proto files to extract_includes.bat
| | * | Appveyor MinGW buildGravatar Ivan Shynkarenka2018-05-03
| |/ / |/| |
* | | Cygwin build failedGravatar Ivan Shynkarenka2018-05-02
| | |
| | * Include file information in all DLL and EXE outputsGravatar Jozef Izso2018-04-28
| | |
| | * Add file information to Windows binariesGravatar Jozef Izso2018-04-27
| |/ |/|
| * fix duplicate mkdir in update_file_lists.shGravatar Corentin Le Molgat2018-04-25
| | | | | | | | | | - merge loop for .h and .proto includes - fix shellcheck errors
* | CMake: Update CXX Standard managementGravatar Corentin Le Molgat2018-04-24
| |
| * Add .proto files to extract_includes.batGravatar Mizux2018-04-24
|/ | | | | 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.
* Fix problem: cmake build failed in c++11 by clangGravatar Silver Chan2018-04-04
| | | CMakeLists.txt adds c++11 flags for clang
* Merge pull request #4467 from xfxyjwf/errorGravatar Feng Xiao2018-04-02
|\ | | | | Improve error message when googletest is missing.
| * Improve error message when googletest is missing.Gravatar Feng Xiao2018-04-02
| |
* | Update instructions about getting protobuf source.Gravatar Feng Xiao2018-03-29
|/
* Include googletest as a submodule (#3993)Gravatar Carlos O'Ryan2018-03-26
| | | Add googletest as a submodule in third_party/googletest.
* Remove javanano.Gravatar Feng Xiao2018-03-26
|
* Removed some unused C++ source filesGravatar Adam Cozzette2018-03-22
|
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| |
| * Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Gravatar Feng Xiao2018-03-01
| | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.
| * Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.Gravatar John Millikin2018-02-24
| | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting.
| * Added instruction for existing ZLIB configurationGravatar Abdul Sami2018-02-21
|/ | | Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
* Merge pull request #4259 from Mizux/masterGravatar Feng Xiao2018-02-02
|\ | | | | Various CMake Update
| * Use NEW behaviour for project VERSION variables.Gravatar Corentin Le Molgat2018-02-01
| | | | | | | | cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
| * Even with MSVC enable zlib support as default behaviour.Gravatar Corentin Le Molgat2018-02-01
| |
| * Add CMake ALIAS targetsGravatar Corentin Le Molgat2018-02-01
| | | | | | | | | | We follow the findProtobuf.cmake naming convention to ease the use of protobuf as cmake subproject
| * Add VERSION property to CMake library targetsGravatar Corentin Le Molgat2018-02-01
| |
* | cmake: privately add sources to targetsGravatar Ben Boeckel2018-01-19
|/ | | | | 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 listsGravatar Adam Cozzette2017-12-07
| | | | | This should fix Bazel builds, since those were missing a new file (implicit_weak_message.cc).
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| |
| * Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\
| * | Allow one to omit building libprotoc and protoc binariesGravatar Yangqing Jia2017-11-13
|/ /
| * Fix Atomic32/AtomicWord on some platforms.Gravatar Jisi Liu2017-11-08
|/ | | | | | | | | | - 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.
* Merge pull request #3722 from timou/cmake-windows-cleanGravatar Jisi Liu2017-10-27
|\ | | | | Suppress VS2017 compiler/linker warnings
| * Sort MSVC warning suppressionsGravatar Tim Ebringer2017-10-21
| | | | | | | | Add brief documentation describing each warning suppression.
* | Merge pull request #3770 from pherl/3.5-integrateGravatar Jisi Liu2017-10-19
|\ \ | | | | | | Integrate google internal changes for the up coming 3.5 release.
* \ \ Merge pull request #3751 from uykusuz/masterGravatar Jisi Liu2017-10-18
|\ \ \ | | | | | | | | fixes issue #3750
| | * | Merge from google internalGravatar Jisi Liu2017-10-18
| | | |
| * | | fixes issue #3750Gravatar Boris Broenner2017-10-14
| |/ / | | | | | | | | | | | | In protobuf-module.cmake: in addition to checking for release or debug variants of protoc's location we should also check the configuration "noconfig".
| | * Suppress VS2017 compiler/linker warningsGravatar Tim Ebringer2017-10-06
| |/ | | | | | | | | | | | | | | 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.
* / protobuf_generate: create include path only for proto filesGravatar Markus Heß2017-09-29
|/
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 04:00:05 +0000