Yannic Bonenberger
4979489451
Add test to verify BUILD- and cmake-files are in sync with src/Makefile.am
5 years ago
Adam Cozzette
582640ef31
Updated cmake path to io_win32.h ( #6397 )
...
Fixes #6382 .
5 years ago
Ben Bader
56e7bdf278
Fix builtin_atomics check in CMakeLists.txt
5 years ago
boscosiu
55ed1d427c
link libatomic on systems without adequate builtin atomics
5 years ago
Hao Nguyen
51026d9229
Down integrate to GitHub
5 years ago
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`.
6 years ago
Hao Nguyen
1d4e959374
Down integrate to GitHub
6 years ago
Hao Nguyen
176f7db11d
Down integrate to Github
6 years ago
Hao Nguyen
c163a2d1a4
Revert accidentally commit
6 years ago
Hao Nguyen
a48a574f7e
Down integrate to Github
6 years ago
Phillipp Schoppmann
8e5b2f1b82
Update file list for protobuf_lite
6 years ago
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.
6 years ago
Hao Nguyen
d47c3e9258
Fix CMake conflict
6 years ago
Hao Nguyen
2f864fdfdf
Down integrate to Github
6 years ago
Yilun Chong
d8c2501b43
down integration from internal
6 years ago
Xiang Dai
e479410564
delete all duplicate empty blanks ( #5758 )
...
Signed-off-by: Xiang Dai <764524258@qq.com>
6 years ago
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
6 years ago
Michael Matthew Mitchell
dface63d71
Swapped libprotoc and libprotobuf
...
libprotobuf being targed before libprotoc was causing Visual Studio to fail in linking protoc.
6 years ago
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
6 years ago
Aaron Bray
424308216a
Add strtod to libprotobuf-lite
6 years ago
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
6 years ago
Adam Cozzette
81f6aa404c
Ran ./update_file_lists.sh to update CMake configuration
6 years ago
Abdel Younes
35aa9fdcbd
fix: cmake install
6 years ago
Markus Heß
6688b60c36
Windows: install missing headers
6 years ago
dyyap
436139803f
Updated README.md ( #5366 )
...
* Update README.md
6 years ago
Adam Cozzette
0894e07536
Integrated internal changes from Google
6 years ago
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.
6 years ago
Joshua Haberman
64f5af2f9c
Added conformance test impl file to CMake.
6 years ago
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.
6 years ago
Feng Xiao
afe98de32a
Replace repo links.
6 years ago
Jozef Izso
d2c35ce4cb
Backport the PR #4579 to 3.6.x branch
...
Implements #3380
6 years ago
Feng Xiao
bde4eaf137
Update build files.
...
* Fixes https://github.com/google/protobuf/issues/5031
* Fixes https://github.com/google/protobuf/issues/5037
6 years ago
Feng Xiao
6bbe197e9c
Down-integrate from google3.
6 years ago
Roman Popov
a69dfe63bc
tests: fix link failure and stack overflow on Mingw w64
6 years ago
Feng Xiao
b1c5503022
Delete unused files. ( #4942 )
...
* Delete unused files.
6 years ago
Feng Xiao
b3e4e3abe0
Remove js_embed binary. ( #4709 )
...
* Remove js_embed binary.
6 years ago
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}
6 years ago
Steffen Wittmeier
3e84147d53
Fixed protobuf_generate output definition for files relative to the protobuf_generate command
7 years ago
Feng Xiao
143851ed25
Remove js_embed binary. ( #4709 )
...
* Remove js_embed binary.
7 years ago
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
7 years ago
Ivan Shynkarenka
291d9a0ab0
Fix issue with version.rc
7 years ago
Christian von Arnim
411018e3fb
cmake: Fix DEPENDS of add_custom_command in protobuf_generate
7 years ago
Christian von Arnim
b9c0c5f526
cmake: Add parameter PROTOC_OUT_DIR to protobuf_generate
7 years ago
Christian von Arnim
e8ae76fbde
cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generate
7 years ago
Ivan Shynkarenka
feb183d895
Appveyor MinGW build
7 years ago
Ivan Shynkarenka
f80a886bc1
Cygwin build failed
7 years ago
Jozef Izso
b1fecd0dea
Include file information in all DLL and EXE outputs
7 years ago
Jozef Izso
3415201d1d
Add file information to Windows binaries
7 years ago
Corentin Le Molgat
2bd7f516e5
fix duplicate mkdir in update_file_lists.sh
...
- merge loop for .h and .proto includes
- fix shellcheck errors
7 years ago
Corentin Le Molgat
c3b152c7e0
CMake: Update CXX Standard management
7 years ago