6bbe197e9c
Down-integrate from google3.
6 years ago
a69dfe63bc
tests: fix link failure and stack overflow on Mingw w64
6 years ago
b1c5503022
Delete unused files. ( #4942 )
...
* Delete unused files.
6 years ago
b3e4e3abe0
Remove js_embed binary. ( #4709 )
...
* Remove js_embed binary.
6 years ago
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
3e84147d53
Fixed protobuf_generate output definition for files relative to the protobuf_generate command
7 years ago
143851ed25
Remove js_embed binary. ( #4709 )
...
* Remove js_embed binary.
7 years ago
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
291d9a0ab0
Fix issue with version.rc
7 years ago
411018e3fb
cmake: Fix DEPENDS of add_custom_command in protobuf_generate
7 years ago
b9c0c5f526
cmake: Add parameter PROTOC_OUT_DIR to protobuf_generate
7 years ago
e8ae76fbde
cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generate
7 years ago
feb183d895
Appveyor MinGW build
7 years ago
f80a886bc1
Cygwin build failed
7 years ago
b1fecd0dea
Include file information in all DLL and EXE outputs
7 years ago
3415201d1d
Add file information to Windows binaries
7 years ago
2bd7f516e5
fix duplicate mkdir in update_file_lists.sh
...
- merge loop for .h and .proto includes
- fix shellcheck errors
7 years ago
c3b152c7e0
CMake: Update CXX Standard management
7 years ago
3ad8efc75b
Add .proto files to extract_includes.bat
...
For google/or-tools, on windows, we need to use `import "google/protobuf/wrappers.proto";` since we want "optional" int64 and in version3 POD get default value...
-> so we use "google.protobuf.Int64Value" since 0 is a valid value and different from "not set" for our use case.
7 years ago
d3e8a54020
Fix problem: cmake build failed in c++11 by clang
...
CMakeLists.txt adds c++11 flags for clang
7 years ago
8f88a507ee
Improve error message when googletest is missing.
7 years ago
014e76e2cd
Update instructions about getting protobuf source.
7 years ago
3c5442a95d
Include googletest as a submodule ( #3993 )
...
Add googletest as a submodule in third_party/googletest.
7 years ago
d5a0024171
Remove javanano.
7 years ago
0c5fcdee44
Removed some unused C++ source files
7 years ago
0400cca323
Integrated internal changes from Google
7 years ago
fd595fcc93
Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."
...
This reverts commit 724f0be33d
7 years ago
724f0be33d
Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.
...
This lets all values of `WELL_KNOWN_PROTOS` be treated the same with
regard to Bazel's protobuf blacklisting.
7 years ago
fe33c5fe9d
Added instruction for existing ZLIB configuration
...
Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
7 years ago
1ec9beb477
Use NEW behaviour for project VERSION variables.
...
cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
7 years ago
8dd0f4e557
Even with MSVC enable zlib support as default behaviour.
7 years ago
f7a05844eb
Add CMake ALIAS targets
...
We follow the findProtobuf.cmake naming convention
to ease the use of protobuf as cmake subproject
7 years ago
3bc0282fb6
Add VERSION property to CMake library targets
7 years ago
9d0a44c9de
cmake: privately add sources to targets
...
Public sources get added to dependencies of the target as well which can
cause duplicate symbols.
7 years ago
609d752650
Ran update_file_lists.sh to update Bazel and CMake file lists
...
This should fix Bazel builds, since those were missing a new file
(implicit_weak_message.cc).
7 years ago
92a7e778e7
Integrated internal changes from Google
7 years ago
cba18efe18
Allow one to omit building libprotoc and protoc binaries
7 years ago
181e284b55
Fix Atomic32/AtomicWord on some platforms.
...
- Removed the redefination in the atomicword_compat.h. Now Atomic32 will
alwyas be intptr_t in 32bit platforms, the bridge is no longer needed.
- Change NaCl 64bit to use intptr_t instead of int32 for Atomic32,
otherwise AtmoicWord APIs will miss the definations.
After this change, the AtmoicWord will always be either Atomic32 or
Atmoic64 depending on the platforms.
7 years ago
a23669c2f6
Sort MSVC warning suppressions
...
Add brief documentation describing each warning suppression.
7 years ago
1a7a7fca80
Merge from google internal
7 years ago
be13314b2a
fixes issue #3750
...
In protobuf-module.cmake: in addition to checking for release or debug
variants of protoc's location we should also check the configuration "noconfig".
7 years ago
2a72840425
Suppress VS2017 compiler/linker warnings
...
VS2017 warns about a few additional things, for example, files that
define no symbols (which is typically the result of a platform specific
ifdef not applying on Windows).
Suppress these warnings so the build is clean on VS2017.
7 years ago
f7e209951e
protobuf_generate: create include path only for proto files
7 years ago
0e069e5a2d
generate python code when calling PROTOBUF_GENERATE_PYTHON
7 years ago
9829b8f511
protobuf_generate: add EXPORT_MACRO option
7 years ago
13fd045dbb
Integrated internal changes from Google
7 years ago
444aecd35a
fix protobuf_generate function
7 years ago
d77c8c5e44
remove the duplication
7 years ago
12c186f7c6
Fix makefile.am
7 years ago
e177739fa2
Fix build files
7 years ago
Feng Xiao
Roman Popov
Markus Heß
Steffen Wittmeier
Mizux
Ivan Shynkarenka
Christian von Arnim
Jozef Izso
Corentin Le Molgat
Silver Chan
Carlos O'Ryan
Adam Cozzette
John Millikin
Abdul Sami
Ben Boeckel
Yangqing Jia
Jisi Liu
Tim Ebringer
Boris Broenner
Tim Ebringer