AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
8,963 Commits 35 Branches 138 Tags 124 MiB
706ed2d17a
Commit Graph

319 Commits

Author SHA1 Message Date
Adam Cozzette
d049bce844
Remove references to HAVE_PTHREAD (#9100) 
This is based on @haberman's changes in #8257. Now that we're using
std::mutex we no longer need to check whether pthreads are available, so
this commit removes references to HAVE_PTHREAD. I left the autotools
build alone, though, since we are likely to drop support for it soon
anyway.
 2021-10-15 13:10:38 -07:00
Shigeo Hashimoto
25180ac9b6
Fix build failed for visual studio in multi-byte windows environments (#7235) 
* Set source and executable charset to utf-8 when Visual Studio

* Remove unnecessary version check for visual studio
 2021-10-14 09:45:40 -07:00
Adam Cozzette
7f79a416ff Update the file lists with ./update_file_lists.sh 2021-10-12 11:49:50 -07:00
Adam Cozzette
4ffb31e906 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-10-12 10:19:11 -07:00
Adam Cozzette
9488e2f8eb
Update cmake file lists (#9038) 
I ran ./update_file_lists.sh to update these files.
 2021-10-12 10:08:05 -07:00
Adam Cozzette
3afc828309 Sync from Piper @401883098 
PROTOBUF_SYNC_PIPER
 2021-10-08 16:45:26 -07:00
Josh Haberman
28c52fd5c4 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-09-27 19:18:42 +00:00
Josh Haberman
624d29d833 Sync from Piper @399250367 
PROTOBUF_SYNC_PIPER
 2021-09-27 19:18:41 +00:00
johanmoe
06c8cbea59
Fix cmake install for protoc component (#8994) 
Fixes:
  * RUNTIME DESTINATION for protoc TARGET is not given a COMPONENT option
 2021-09-22 14:25:29 -07:00
David L. Jones
96d983a02e
Tweak update_file_lists.sh to handle changes to Makefile.am. (#8965) 2021-09-10 19:32:15 -07:00
Joshua Haberman
018e2e7751 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	src/google/protobuf/descriptor.pb.cc
#	src/google/protobuf/duration.pb.cc
#	src/google/protobuf/timestamp.pb.cc
#	src/google/protobuf/type.pb.cc
#	src/google/protobuf/wrappers.pb.cc
 2021-09-09 08:23:12 -07:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834 
PROTOBUF_SYNC_PIPER
 2021-09-09 08:21:42 -07:00
Saleem Abdulrasool
bf7a5e40a8 build: fix the support for CMake[<3.7] 
The `VERSION_GREATER_EQUAL` operator was introduced in CMake 3.7.0
(released in 2016).  Use the long form of the check by splitting the
operation into two comparisons to support the older CMake.
 2021-09-01 08:34:12 -07:00
Joshua Haberman
f79f956b74
Merge pull request #8851 from compnerd/msvc-runtime-library 
cmake: support `MSVC_RUNTIME_LIBRARY` property
 2021-08-28 13:37:36 -07:00
Adam Cozzette
4eed0dab5a Sync from Piper @392076391 
PROTOBUF_SYNC_PIPER
 2021-08-20 15:05:53 -07:00
Bo Yang
b9d6693545 Update BUILD and cmake files 2021-08-18 10:25:22 -07:00
Bo Yang
04fc93f4b5 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-08-18 09:25:50 -07:00
Bo Yang
509aee4b8b Sync from Piper @391414001 
PROTOBUF_SYNC_PIPER
 2021-08-17 17:26:34 -07:00
Adam Cozzette
2fd5c96f4d Add map_test.inc to build configs and new Kotlin files to java_EXTRA_DIST 2021-08-03 14:13:43 -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
5d03f8c8a5 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-08-03 12:25:42 -07:00
Adam Cozzette
562fc946c7 Sync from Piper @388508285 
PROTOBUF_SYNC_PIPER
 2021-08-03 11:58:05 -07:00
Saleem Abdulrasool
c47adad0c3 cmake: support MSVC_RUNTIME_LIBRARY property 
When using a new enough CMake (3.15+) prefer to use the
`MSVC_RUNTIME_LIBRARY` property on targets to select the runtime library
variant.  This property is automatically set to the value specified by
`CMAKE_MSVC_RUNTIME_LIBRARY`.  This property requires that the CMake
Policy 91 is set to new (see CMP0091).
 2021-08-01 09:42:49 -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
a8d8eb17df Merge tag 'refs/tags/sync-piper' into sync-stage 2021-05-24 13:49:40 -07:00
Joshua Haberman
9521803d40 Sync from Piper @375548932 
PROTOBUF_SYNC_PIPER
 2021-05-24 13:49:39 -07:00
Deanna Garcia
1b827fa114 Run update_file_lists.sh 2021-05-20 18:52:08 +00:00
deannagarcia
76188afb94
Merge pull request #8272 from deannagarcia/kotlinProtos 
Opensourcing kotlin protos
 2021-04-21 10:29:26 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211 
PROTOBUF_SYNC_PIPER
 2021-04-15 15:53:17 -07:00
Deanna Garcia
438d777e05 Adding file names to cmake files 2021-03-24 20:00:57 +00:00
Adam Cozzette
ee35b2da4b
Merge pull request #8374 from igor-sirotin/feature/cmake-protoc-options 
[CMake] Abilty to pass options to protoc executable from cmake
 2021-03-15 12:51:13 -07:00
Adam Cozzette
673971834c
Merge branch 'master' into 3.15.x 2021-03-04 17:53:03 -08:00
Florian Simon
b9a036b444 Do not disable RTTI by default in the CMake build 2021-03-04 10:18:33 -08:00
Igor Sirotin
5d0c30934b Added abilty to pass options to protoc executable from cmake 2021-03-04 13:37:24 +03:00
Florian Simon
1add7a7bd6 Create a CMake option to control whether or not RTTI is enabled 
This is useful for Conan recipes that build Protobuf, in which
whatever we want to enable has to be enabled in the initial command line.
Without this, the people maintaining the recipe have to patch the CMake
setup of Protobuf before building the binaries.

Closes #5541
 2021-03-02 13:47:05 -08:00
Florian Simon
a4e7b97bd6 Create a CMake option to control whether or not RTTI is enabled 
This is useful for Conan recipes that build Protobuf, in which
whatever we want to enable has to be enabled in the initial command line.
Without this, the people maintaining the recipe have to patch the CMake
setup of Protobuf before building the binaries.

Closes #5541
 2021-03-02 11:09:28 -08:00
Anton Danielsson
630028a4c6 Fix cmake install on iOS 
Fixes:
INSTALL TARGETS given no BUNDLE DESTINATION for MACOSX_BUNDLE executable
 2021-03-01 17:32:31 -08:00
deannagarcia
9fee757e46
Update libprotoc.cmake 2021-01-25 16:21:42 -08:00
Rosen Penev
cb8ca280cd remove CMAKE_THREAD_LIBS_INIT from pkgconfig CFLAGS 
This is a linker flag and does not belong in CFLAGS.

Fixes an issue with ola and protobuf.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
 2020-12-28 10:30:00 -08:00
Biswapriyo Nath
c777ade07b Conformance/CMake: Remove non-existence binary_json_conformance_main.cc file. 2020-12-01 10:05:33 -08:00
Tongliang Liao
5a7a4a52a7 Install examples in /usr/local/share/protobuf/examples. 2020-11-23 15:58:38 -08: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
Jichan
022078d3ee Fix a CMake module for support RelWithDebInfo and MinSizeRel install 2020-10-26 16:53:47 -07:00
RPG3D
ce66f6047d Update libprotobuf.cmake 2020-10-13 15:15:08 -07:00
RPG3D
6aaa40f2a9 Update libprotobuf.cmake 
link log library on Android
 2020-10-13 15:15:08 -07:00
RPG3D
6eedd1a519 Update libprotobuf-lite.cmake 
link log library on Android
 2020-10-13 15:15:08 -07:00
Daniel Joos
c8f76331ab
Adds a CMake option to build libprotoc separately (#7949) 
This exposes the variable `protobuf_BUILD_LIBPROTOC` as CMake option to be able to build libprotoc without building the protoc binary.
 2020-10-09 15:54:39 -07:00
Joshua Haberman
a633ad452d Ran update_file_lists.sh to pick up arenastring.cc. 2020-09-28 12:19:39 -07:00