aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Added conformance test impl file to CMake.Joshua Haberman2018-09-021-0/+1
|
* Merge pull request #5078 from haberman/conformance-cmakeJoshua Haberman2018-09-022-0/+52
|\ | | | | Added cmake build files for the conformance test runner.
| * Added cmake build files for the conformance test runner.Josh Haberman2018-08-242-0/+52
| | | | | | | | | | I want to use the conformance tests from upb, which is switching to CMake.
* | Replace repo links.Feng Xiao2018-08-221-2/+2
| |
* | Update build files.Feng Xiao2018-08-132-0/+4
| | | | | | | | | | * Fixes https://github.com/google/protobuf/issues/5031 * Fixes https://github.com/google/protobuf/issues/5037
* | Merge master branch.Feng Xiao2018-08-081-0/+7
|\|
| * tests: fix link failure and stack overflow on Mingw w64Roman Popov2018-07-301-0/+7
| |
* | Down-integrate from google3.Feng Xiao2018-08-082-0/+5
|/
* Delete unused files. (#4942)Feng Xiao2018-07-191-4/+0
| | | * Delete unused files.
* protobuf_generate(): add relative path to output dirMarkus Heß2018-07-101-1/+1
| | | | | | | 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}
* Fixed protobuf_generate output definition for files relative to the ↵Steffen Wittmeier2018-06-251-1/+3
| | | | protobuf_generate command
* Remove js_embed binary. (#4709)Feng Xiao2018-06-011-12/+0
| | | | * Remove js_embed binary.
* CMake OSX rpath management (#4620)Mizux2018-05-222-1/+19
| | | | | | | | | | | | | | * 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
* Merge pull request #4619 from ccvca/cmake_protobuf_generate_changesFeng Xiao2018-05-171-8/+12
|\ | | | | cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR
| * cmake: Fix DEPENDS of add_custom_command in protobuf_generateChristian von Arnim2018-05-151-1/+1
| |
| * cmake: Add parameter PROTOC_OUT_DIR to protobuf_generateChristian von Arnim2018-05-141-3/+7
| |
| * cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generateChristian von Arnim2018-05-141-4/+4
| |
* | Fix issue with version.rcIvan Shynkarenka2018-05-154-0/+8
| |
* | Merge pull request #4579 from jozefizso/dev/3380_version_infoFeng Xiao2018-05-146-4/+79
|\ \ | | | | | | Include version information in Windows binaries #3380
| * | Include file information in all DLL and EXE outputsJozef Izso2018-04-284-5/+20
| | |
| * | Add file information to Windows binariesJozef Izso2018-04-274-3/+63
| | |
* | | Merge pull request #4587 from chronoxor/masterFeng Xiao2018-05-141-0/+4
|\ \ \ | |_|/ |/| | Appveyor MinGW build
| * | Appveyor MinGW buildIvan Shynkarenka2018-05-031-0/+4
| | |
* | | Merge pull request #4538 from Mizux/patch-2Feng Xiao2018-05-101-0/+12
|\ \ \ | |/ / |/| | Add .proto files to extract_includes.bat
| * | fix duplicate mkdir in update_file_lists.shCorentin Le Molgat2018-04-251-3/+0
| | | | | | | | | | | | | | | - merge loop for .h and .proto includes - fix shellcheck errors
| * | Add .proto files to extract_includes.batMizux2018-04-241-0/+15
| | | | | | | | | | | | | | | 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.
* | | Cygwin build failedIvan Shynkarenka2018-05-021-4/+8
| |/ |/|
* | CMake: Update CXX Standard managementCorentin Le Molgat2018-04-241-3/+5
|/
* Fix problem: cmake build failed in c++11 by clangSilver Chan2018-04-041-0/+3
| | | CMakeLists.txt adds c++11 flags for clang
* Merge pull request #4467 from xfxyjwf/errorFeng Xiao2018-04-021-1/+6
|\ | | | | Improve error message when googletest is missing.
| * Improve error message when googletest is missing.Feng Xiao2018-04-021-1/+6
| |
* | Update instructions about getting protobuf source.Feng Xiao2018-03-291-6/+14
|/
* Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-262-24/+15
| | | Add googletest as a submodule in third_party/googletest.
* Remove javanano.Feng Xiao2018-03-263-48/+7
|
* Removed some unused C++ source filesAdam Cozzette2018-03-222-3/+2
|
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-0/+5
|\
| * Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Feng Xiao2018-03-012-1/+1
| | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.
| * Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.John Millikin2018-02-242-1/+1
| | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting.
| * Added instruction for existing ZLIB configurationAbdul Sami2018-02-211-0/+5
| | | | | | Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
* | Integrated internal changes from GoogleAdam Cozzette2018-03-133-23/+2
|/
* Merge pull request #4259 from Mizux/masterFeng Xiao2018-02-025-5/+12
|\ | | | | Various CMake Update
| * Use NEW behaviour for project VERSION variables.Corentin Le Molgat2018-02-011-0/+4
| | | | | | | | cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
| * Even with MSVC enable zlib support as default behaviour.Corentin Le Molgat2018-02-011-5/+1
| |
| * Add CMake ALIAS targetsCorentin Le Molgat2018-02-014-0/+4
| | | | | | | | | | We follow the findProtobuf.cmake naming convention to ease the use of protobuf as cmake subproject
| * Add VERSION property to CMake library targetsCorentin Le Molgat2018-02-013-0/+3
| |
* | cmake: privately add sources to targetsBen Boeckel2018-01-191-1/+1
|/ | | | | Public sources get added to dependencies of the target as well which can cause duplicate symbols.
* Ran update_file_lists.sh to update Bazel and CMake file listsAdam Cozzette2017-12-071-0/+1
| | | | | This should fix Bazel builds, since those were missing a new file (implicit_weak_message.cc).
* Merge branch 'master' into down-integrateAdam Cozzette2017-12-013-13/+27
|\
| * Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-301-1/+0
| |\
| | * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-06 15:27:15 +0000