aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.
| * Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.John Millikin2018-02-242-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 configurationAbdul Sami2018-02-211-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 GoogleAdam Cozzette2018-03-133-23/+2
|/
* Merge pull request #4259 from Mizux/masterFeng Xiao2018-02-025-5/+12
|\ | | | | Various CMake Update
| * Use NEW behaviour for project VERSION variables.Corentin Le Molgat2018-02-011-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 Molgat2018-02-011-5/+1
| |
| * Add CMake ALIAS targetsCorentin Le Molgat2018-02-014-0/+4
| | | | | | | | | | We follow the findProtobuf.cmake naming convention to ease the use of protobuf as cmake subproject
| * Add VERSION property to CMake library targetsCorentin Le Molgat2018-02-013-0/+3
| |
* | cmake: privately add sources to targetsBen Boeckel2018-01-191-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 listsAdam Cozzette2017-12-071-0/+1
| | | | | This should fix Bazel builds, since those were missing a new file (implicit_weak_message.cc).
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 binariesYangqing Jia2017-11-132-12/+27
| |/
* / Integrated internal changes from GoogleAdam Cozzette2017-12-011-0/+2
|/
* Merge pull request #3722 from timou/cmake-windows-cleanJisi Liu2017-10-271-1/+20
|\ | | | | Suppress VS2017 compiler/linker warnings
| * Sort MSVC warning suppressionsTim Ebringer2017-10-211-1/+17
| | | | | | | | Add brief documentation describing each warning suppression.
| * Suppress VS2017 compiler/linker warningsTim Ebringer2017-10-061-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-integrateJisi Liu2017-10-191-0/+1
|\ \ | | | | | | Integrate google internal changes for the up coming 3.5 release.
| * | Merge from google internalJisi Liu2017-10-181-0/+1
| |/
* | Merge pull request #3751 from uykusuz/masterJisi Liu2017-10-181-0/+4
|\ \ | | | | | | fixes issue #3750
| * | fixes issue #3750Boris Broenner2017-10-141-0/+4
| |/ | | | | | | | | In protobuf-module.cmake: in addition to checking for release or debug variants of protoc's location we should also check the configuration "noconfig".
* / protobuf_generate: create include path only for proto filesMarkus Heß2017-09-291-15/+15
|/
* generate python code when calling PROTOBUF_GENERATE_PYTHONMarkus Heß2017-09-251-2/+2
|
* protobuf_generate: add EXPORT_MACRO optionMarkus Heß2017-09-222-4/+11
|
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-0/+1
|
* Merge pull request #3158 from yeswalrus/fix-policy-warningFeng Xiao2017-09-131-2/+2
|\ | | | | Fix policy warning CMP0054
| * Fix policy warning CMP0054Walter Gray2017-05-301-2/+2
| |
* | fix protobuf_generate functionMarkus Heß2017-09-121-7/+12
| |
* | remove the duplicationJisi Liu2017-08-011-1/+0
| |
* | Fix makefile.amJisi Liu2017-07-251-0/+1
| |
* | Fix build filesJisi Liu2017-07-253-5/+0
| |
* | Merge from masterJisi Liu2017-07-258-0/+38
| |
* | Update filelist againJisi Liu2017-07-191-0/+1
| |
* | remove profileJisi Liu2017-07-191-1/+0
| |
* | update build file listJisi Liu2017-07-191-1/+0
| |
* | Merge master into 3.4.xJisi Liu2017-07-187-85/+325
|\ \
| * | replenish missed header files in install stepyjjnls2017-06-191-0/+2
| | | | | | | | | | | | install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0
| * | add protobuf_generate function, allows use of target_sources where availableWalter Gray2017-06-022-68/+116
| | |
| * | fix check_and_save_build_option not correctly exporting build optionsWalter Gray2017-05-301-1/+1
| | |
| * | Fix the check_and_save_build_option macro never evaluating to trueWalter Gray2017-05-301-1/+1
| | |
| * | Fix find module not working when no version number was givenWalter Gray2017-05-301-12/+14
| |/
| * Add headers as part of cmake projectDennis Cappendijk2017-05-293-3/+192
| | | | | | | | tested only on windows with visual studio 2015 as generator
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-183-2/+3
|/
* Fix C++ build for down-integration.Feng Xiao2017-03-291-0/+2
|
* Down-integrate from google3.Feng Xiao2017-03-292-1/+5
|
* add delimited_message_util.cc to libprotobuf.cmakeByron Yi2017-03-161-0/+1
|
* migrate delimited messages functions to util packageByron Yi2017-03-161-0/+1
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 20:38:59 +0000