AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
9,120 Commits 35 Branches 138 Tags 124 MiB
23b2fe6e39
Commit Graph

339 Commits

Author SHA1 Message Date
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
Joshua Haberman
38d6de1eef Sync from Piper @334206209 
PROTOBUF_SYNC_PIPER
 2020-09-28 11:54:54 -07:00
Afshin Pir
a446e6472b Previously, I had incorrectly used some newer features of CMake(version 3.14). But Now I have updated this code to work with older versions of CMake too. 2020-08-19 17:03:36 -07:00
Joshua Haberman
32a94ce353 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	csharp/src/Google.Protobuf.Test/testprotos.pb
 2020-08-17 15:26:33 -07:00
Joshua Haberman
95e6c5b474 Sync from Piper @327110949 
PROTOBUF_SYNC_PIPER
 2020-08-17 15:26:13 -07:00
Peter Newman
e2cc2de304
Fix lots of spelling errors (#7751) 
* Fix a typo

* Fix lots of spelling errors

* Fix a few more spelling mistakes

* s/parsable/parseable/

* Don't touch the third party files

* Cloneable is the preferred C# term

* Copyable is the preferred C++ term

* Revert "s/parsable/parseable/"

This reverts commit 534ecf7675.

* Revert unparseable->unparsable corrections
 2020-08-10 11:08:25 -07:00
Ron Klein
a076adc20f documentation: fix path for fetching submodules 2020-06-19 10:37:28 -07:00
Joshua Haberman
183cdec7cd Sync from Piper @314226556 
PROTOBUF_SYNC_PIPER
 2020-06-01 16:32:31 -07:00
Joshua Haberman
3dcf368c2f Merge branch 'sync-piper' into sync-stage 2020-05-13 13:46:16 -07:00
Joshua Haberman
6ed738305b Sync from Piper @311396324 
PROTOBUF_SYNC_PIPER
 2020-05-13 13:46:15 -07:00
Michael WERLE
976f85b5d5 Add "WITH_CMAKE" define to allow cross-compiling when using the cmake build system. 2020-05-11 10:19:18 -07:00
afshinpir
c91ab40081 Correcting import path selection for protoc 
When there are multiple proto file inputs, they are matched with the provided proto directories (-I option). These directories are tested sequentially for each input proto file and if input file is in a subdirectory of provided proto directories, this directory is considered as base for calculating output directory. This update provides same manner and removes limitations imposed by using `${CMAKE_CURRENT_SOURCE_DIR}` as main proto import directory.
1- `${CMAKE_CURRENT_SOURCE_DIR}` is only added to include directories if no import directory is provided and we are not in `APPEND_PATH` mode. In addition it is added as last possible directory to decrease its priority in searching.
2- Each directory is checked against `${_protobuf_include_path}` to find first possible directory which is parent directory of input proto file. If a directory is found, `${_rel_dir}` is calculated based on its value. If no suitable folder is found, an error will be generated.
 2020-04-07 10:27:11 -07:00
afshinpir
c62ffaa539 Incorrect selection of base name 
protoc just changes last extension. We need this change to support files like a.b.proto in the path.
 2020-04-07 10:27:11 -07:00
Joshua Haberman
b99994d994 Sync from Piper @304070343 
PROTOBUF_SYNC_PIPER
 2020-03-31 16:25:37 -07:00
Falko Axmann
460376190b cmake: extended protobuf_generate 
Added an optional `PLUGIN` argument to `protobuf_generate` which
will be forwarded to the `--plugin=` argument of `protoc`.
 2020-03-09 15:03:07 -07:00
Chuck Atkins
10c48c980f Intel compiler: silence noisy warning for incorrectly evaluated inlining 2020-02-12 13:08:59 -08:00
Rafi Kamal
de75651d7a
Merge 3.11.0-rc1 changes to master (#6917) 
* Update CHANGES.txt with 3.11.0-RC1 release notes (#6909)

* Revert "Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required." (#6914)

* Marked update_compatibility_version.py as executable (#6916)
 2019-11-20 18:03:29 -08:00
Rafi Kamal
58d4420e2d Down Integrate Internal Changes 2019-11-12 13:38:58 -08:00
veawor
129a7c875f Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required. 2019-10-30 16:31:05 -07:00
Daniel Johansen
e93dea7746 update Cmake example to build Visual Studio to newest 2019 version. 2019-10-18 15:39:20 -07:00
debugx
9fdb2cf2bb fixed typo 2019-10-15 12:05:14 -07:00
Changming Sun
95a1c4fbc4 Fix #6098 2019-09-27 15:44:33 -07:00
Yannic Bonenberger
27e85ab55d Address review comments 2019-07-24 10:23:55 -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
Adam Cozzette
582640ef31 Updated cmake path to io_win32.h (#6397) 
Fixes #6382.
 2019-07-17 15:38:57 -07:00
Ben Bader
56e7bdf278 Fix builtin_atomics check in CMakeLists.txt 2019-07-08 20:30:04 -07:00
boscosiu
55ed1d427c link libatomic on systems without adequate builtin atomics 2019-07-03 15:32:29 -07:00
Hao Nguyen
51026d9229 Down integrate to GitHub 2019-06-26 11:01:34 -07:00
Carlos O'Ryan
b10d490efd Fix RPATH when CMAKE_INSTALL_LIBDIR != lib. 
In some platforms ${CMAKE_INSTALL_LIBDIR} expands to `lib64`. The libraries
are correctly installed in that directory, but the RPATH is set to point to
`$ORIGIN/../lib`, where it should be `$ORIGIN/../lib64`.
 2019-06-05 10:39:02 -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
Adam Cozzette
8645d893ab Merge branch '3.7.x' into merge-3-7-x 2019-03-26 14:32:20 -07:00
Adam Cozzette
e6779e9b2a Added io_win32.h to header list in CMake config 
This should fix #5717 and ensure that this header gets installed
properly on Windows.
 2019-03-21 10:30:37 -07:00
Hao Nguyen
d47c3e9258 Fix CMake conflict 2019-03-20 11:51:42 -07:00
Hao Nguyen
2f864fdfdf Down integrate to Github 2019-03-20 11:45:01 -07:00
Bo Yang
cb6fa92ee8 Merge branch '3.7.x' 2019-03-04 10:18:18 -08:00
Yilun Chong
429d2ae19f
Merge branch 'master' into integration 2019-02-24 17:17:17 -08:00
Yilun Chong
d8c2501b43 down integration from internal 2019-02-22 18:13:33 +08:00
Xiang Dai
e479410564 delete all duplicate empty blanks (#5758) 
Signed-off-by: Xiang Dai <764524258@qq.com>
 2019-02-20 19:28:50 -08:00
Paul Yang
5b4ac53c97
Add several fixes for python toolchain (#5667) 
* Add several fixes for python toolchain

* Fix versin regex

* Make script exit on error

* Fix version regex

* Fix version regex

* Fix version regex

* Fix version regex

* Make test run on the current commit

* Fix test

* Fix test

* Use git to retrieve current commit

* Fix tests

* Fix tests

* Also make linux and mac work on the current commit

* Fix test
 2019-02-01 18:43:55 -08:00
Michael Matthew Mitchell
dface63d71 Swapped libprotoc and libprotobuf 
libprotobuf being targed before libprotoc was causing Visual Studio to fail in linking protoc.
 2019-01-31 14:35:57 -08:00
Bo Yang
dbfb9a8a07 Merge branch 'master' into 3.7.x 2019-01-23 12:49:53 -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
Adam Cozzette
81f6aa404c Ran ./update_file_lists.sh to update CMake configuration 2018-12-10 13:49:44 -08:00
Joshua Haberman
d7cd54372c
Merge pull request #5396 from hesmar/hesmar/fixCmakeInstallHeader 
Windows: install missing headers
 2018-12-10 22:41:44 +01:00
Abdel Younes
35aa9fdcbd fix: cmake install 2018-12-10 14:55:17 +01:00
Markus Heß
6688b60c36 Windows: install missing headers 2018-12-05 17:27:21 +01:00
dyyap
436139803f Updated README.md (#5366) 
* Update README.md
 2018-11-15 18:47:08 -08:00
Adam Cozzette
0894e07536 Integrated internal changes from Google 2018-11-09 11:28:22 -08:00
Markus Heß
1509e8e3b3 Revert "protobuf_generate(): add relative path to output dir" 
This reverts commit 93f6b67eb2.

Protoc adds already the relative path to the output directory.
Therefore, we have to remove this again from the output directory
to prevent adding it twice.
 2018-09-28 11:00:55 +02:00
Joshua Haberman
64f5af2f9c Added conformance test impl file to CMake. 2018-09-02 14:22:52 -07:00
Joshua Haberman
d340bdf508
Merge pull request #5078 from haberman/conformance-cmake 
Added cmake build files for the conformance test runner.
 2018-09-02 10:07:14 -07:00
Josh Haberman
4249692ce6 Added cmake build files for the conformance test runner. 
I want to use the conformance tests from upb, which is switching
to CMake.
 2018-08-24 12:27:21 -07:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00
Feng Xiao
bde4eaf137 Update build files. 
* Fixes https://github.com/google/protobuf/issues/5031
* Fixes https://github.com/google/protobuf/issues/5037
 2018-08-13 14:41:27 -07:00
Feng Xiao
a8465b738e Merge master branch. 2018-08-08 17:14:42 -07:00
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Roman Popov
a69dfe63bc tests: fix link failure and stack overflow on Mingw w64 2018-07-30 21:55:44 -07:00
Feng Xiao
b1c5503022
Delete unused files. (#4942) 
* Delete unused files.
 2018-07-19 17:30:15 -07:00
Markus Heß
93f6b67eb2 protobuf_generate(): add relative path to output dir 
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}
 2018-07-10 18:23:53 +02:00
Steffen Wittmeier
3e84147d53 Fixed protobuf_generate output definition for files relative to the protobuf_generate command 2018-06-25 11:29:56 +02:00
Feng Xiao
143851ed25
Remove js_embed binary. (#4709) 
* Remove js_embed binary.
 2018-06-01 11:00:04 -07:00
Mizux
7306f549bf CMake OSX rpath management (#4620) 
* 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
 2018-05-22 12:52:07 -07:00
Feng Xiao
fb33d88ed1
Merge pull request #4619 from ccvca/cmake_protobuf_generate_changes 
cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR
 2018-05-17 10:17:57 -07:00
Ivan Shynkarenka
291d9a0ab0 Fix issue with version.rc 2018-05-15 23:19:58 +03:00
Christian von Arnim
411018e3fb
cmake: Fix DEPENDS of add_custom_command in protobuf_generate 2018-05-15 09:06:54 +02:00
Feng Xiao
ac34bf8f59
Merge pull request #4579 from jozefizso/dev/3380_version_info 
Include version information in Windows binaries #3380
 2018-05-14 13:47:28 -07:00
Feng Xiao
4600f789a2
Merge pull request #4587 from chronoxor/master 
Appveyor MinGW build
 2018-05-14 13:44:29 -07:00
Christian von Arnim
b9c0c5f526
cmake: Add parameter PROTOC_OUT_DIR to protobuf_generate 2018-05-14 09:22:34 +02:00
Christian von Arnim
e8ae76fbde
cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generate 2018-05-14 09:22:08 +02:00
Feng Xiao
2213c1c1f6
Merge pull request #4538 from Mizux/patch-2 
Add .proto files to extract_includes.bat
 2018-05-10 22:44:47 -07:00
Ivan Shynkarenka
feb183d895 Appveyor MinGW build 2018-05-03 03:17:19 +03:00
Ivan Shynkarenka
f80a886bc1 Cygwin build failed 2018-05-02 03:01:10 +03:00