Commit Graph

290 Commits

Author SHA1 Message Date
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
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