Commit Graph

46 Commits

Author SHA1 Message Date
Adam Cozzette
3afc828309 Sync from Piper @401883098
PROTOBUF_SYNC_PIPER
2021-10-08 16:45:26 -07:00
Josh Haberman
624d29d833 Sync from Piper @399250367
PROTOBUF_SYNC_PIPER
2021-09-27 19:18:41 +00:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834
PROTOBUF_SYNC_PIPER
2021-09-09 08:21:42 -07:00
Adam Cozzette
4eed0dab5a Sync from Piper @392076391
PROTOBUF_SYNC_PIPER
2021-08-20 15:05:53 -07:00
Bo Yang
509aee4b8b Sync from Piper @391414001
PROTOBUF_SYNC_PIPER
2021-08-17 17:26:34 -07:00
Adam Cozzette
d46abc1e7e Update BUILD and cmake files and add some missing Java dependencies 2021-08-03 13:44:26 -07:00
Adam Cozzette
336ed1820a
Move field_access_listener from libprotobuf-lite to libprotobuf (#8775)
This should fix #8768. The field access listener code can't build
successfully as part of protobuf-lite because it relies on descriptors.
2021-06-28 16:07:28 -07:00
Jorge López Fueyo
1ae531d73b
Disabled version.rc for clang-cl (#8139) 2021-06-04 11:13:56 -07:00
Joshua Haberman
45bb1d2feb Added new file to build files. 2021-05-24 15:33:54 -07:00
Joshua Haberman
fdc35840b9
Merge pull request #7925 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2020-10-28 12:02:24 -07:00
RPG3D
6eedd1a519 Update libprotobuf-lite.cmake
link log library on Android
2020-10-13 15:15:08 -07:00
Joshua Haberman
38d6de1eef Sync from Piper @334206209
PROTOBUF_SYNC_PIPER
2020-09-28 11:54:54 -07:00
Joshua Haberman
95e6c5b474 Sync from Piper @327110949
PROTOBUF_SYNC_PIPER
2020-08-17 15:26:13 -07:00
Yannic Bonenberger
4979489451 Add test to verify BUILD- and cmake-files are in sync with src/Makefile.am 2019-07-24 10:23:55 -07:00
boscosiu
55ed1d427c link libatomic on systems without adequate builtin atomics 2019-07-03 15:32:29 -07:00
Hao Nguyen
1d4e959374 Down integrate to GitHub 2019-05-03 14:33:43 -07:00
Hao Nguyen
6dc9832aab Merge branch 'master' of https://github.com/protocolbuffers/protobuf into sync201904090622 2019-04-09 06:25:48 -07:00
Hao Nguyen
176f7db11d Down integrate to Github 2019-04-09 06:23:32 -07:00
Hao Nguyen
c163a2d1a4 Revert accidentally commit 2019-04-05 17:09:42 -07:00
Hao Nguyen
86bc27d220 Merge branch 'master' of https://github.com/protocolbuffers/protobuf 2019-04-05 16:41:24 -07:00
Hao Nguyen
a48a574f7e Down integrate to Github 2019-04-05 16:39:18 -07:00
Phillipp Schoppmann
8e5b2f1b82 Update file list for protobuf_lite 2019-04-01 14:06:18 -07:00
Yilun Chong
d8c2501b43 down integration from internal 2019-02-22 18:13:33 +08:00
Yilun Chong
0adb74c2d3 Down-integrate internal changes to github. (#5555)
* Down-integrate internal changes to github.

* fix python conformance test

* fix csharp conformance test

* add back java map_lite_test.proto's optimize for option

* fix php conformance test
2019-01-08 15:06:30 -08:00
Adam Cozzette
43c3abf077
Merge pull request #5489 from aaron-bray/master
Use NoLocalStrtod for international compliance
2018-12-21 21:07:34 -08:00
Aaron Bray
424308216a Add strtod to libprotobuf-lite 2018-12-20 14:13:57 -05:00
Paul Yang
cecba296b8
Down-integrate internal changes (#5467)
* Down-integrate internal changes

* Update generated code for php, objc and csharp.

* Add missing dependency in conformance_php
2018-12-14 16:05:03 -08:00
Ivan Shynkarenka
291d9a0ab0 Fix issue with version.rc 2018-05-15 23:19:58 +03:00
Jozef Izso
b1fecd0dea Include file information in all DLL and EXE outputs 2018-04-28 00:12:38 +02:00
Jozef Izso
3415201d1d Add file information to Windows binaries 2018-04-27 23:44:38 +02:00
Adam Cozzette
0400cca323 Integrated internal changes from Google 2018-03-13 16:37:29 -07:00
Corentin Le Molgat
f7a05844eb Add CMake ALIAS targets
We follow the findProtobuf.cmake naming convention
to ease the use of protobuf as cmake subproject
2018-02-01 20:31:36 +01:00
Corentin Le Molgat
3bc0282fb6 Add VERSION property to CMake library targets 2018-02-01 20:31:36 +01:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Jisi Liu
12c186f7c6 Fix makefile.am 2017-07-25 14:38:00 -07:00
Jisi Liu
759245a49a Merge from master 2017-07-25 11:52:33 -07:00
Dennis Cappendijk
4eb02fe31e Add headers as part of cmake project
tested only on windows with visual studio 2015 as generator
2017-05-29 17:34:08 +02:00
Konstantin Podsvirov
c3aa4c2675 Improved SHARED build from CMake project 2015-10-15 02:56:48 +03:00
Konstantin Podsvirov
f397ede7c6 Add CMake option protobuf_DEBUG_POSTFIX 2015-09-17 13:00:12 +03:00
Jisi Liu
b90f9f8073 Update cmake and BUILD files.
Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
2015-08-25 17:06:33 -07:00
Jisi Liu
c3bc155ace Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
2015-08-21 11:18:45 -07:00
Tom Hughes
6d72d12575 Set cmake include directories on library targets.
cmake targets that depend on these libraries will automatically have
these include directories.
2015-07-28 16:18:35 -07:00
Feng Xiao
818c5eee08 Fix broken builds. 2015-06-17 11:19:46 -07:00
Feng Xiao
e96ff30120 Down-integrate from internal code base.
[ci skip]

Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
2015-06-15 18:24:01 -07:00
Feng Xiao
4333edb340 Add cmake support. 2015-05-31 02:28:34 -07:00