Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabled | Konstantin Podsvirov | 2016-07-28 | 1 | -1/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/3.0.0-beta-4' | Feng Xiao | 2016-07-18 | 2 | -64/+64 |
|\ | |||||
| * | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 2 | -64/+64 |
| | | |||||
* | | Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to ↵ | Walter Gray | 2016-07-12 | 1 | -1/+1 |
|/ | | | | be ignored. | ||||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1666 from yeswalrus/cmake-prerelease-examples | Feng Xiao | 2016-06-17 | 2 | -15/+22 |
|\ | | | | | CMake Fix up prerelease version handling | ||||
| * | Fix prerelease version matching to be more consistent with the find_package ↵ | Walter Gray | 2016-06-09 | 2 | -15/+22 |
| | | | | | | | | arguments. | ||||
* | | Merge pull request #1658 from yeswalrus/cmake-fixup-module | Feng Xiao | 2016-06-15 | 1 | -24/+9 |
|\ \ | | | | | | | Cleanup protobuf-module.cmake.in | ||||
| * | | Removed handling for ALIASED targets since they are unused. | Walter Gray | 2016-06-07 | 1 | -24/+9 |
| |/ | |||||
* | | make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use. | Walter Gray | 2016-06-09 | 1 | -1/+3 |
| | | |||||
* | | Save the relevant options used to create a package, allow users to reject ↵ | Walter Gray | 2016-06-09 | 2 | -11/+20 |
|/ | | | | packages based on them. | ||||
* | Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning | Feng Xiao | 2016-06-07 | 2 | -17/+30 |
|\ | | | | | CMake prerelease versioning | ||||
| * | For prerelease versions, require protobuf_FIND_VERSION to be set. | Walter Gray | 2016-05-31 | 1 | -16/+22 |
| | | |||||
| * | Include the prerelease version in the protobuf_VERSION | Walter Gray | 2016-05-31 | 1 | -1/+8 |
| | | |||||
* | | Replace handwritten protobuf-targets with exported version. | Walter Gray | 2016-06-06 | 3 | -39/+24 |
| | | |||||
* | | Use ExternalProject_Add to build the examples in a stand-alone fashion. | Walter Gray | 2016-06-06 | 1 | -2/+49 |
| | | |||||
* | | CMake project updates | Konstantin Podsvirov | 2016-06-04 | 8 | -69/+233 |
| | | | | | | | | | | | | | | | | | | A series of improvements: - Improved Protobuf module compatibility (disabled by default); - Hide advanced settings; - Added build tree configuration; - Added build of examples. | ||||
* | | Integrate interanl changes | Bo Yang | 2016-06-02 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #1613 from yeswalrus/cmake-min-version | Feng Xiao | 2016-05-31 | 1 | -1/+1 |
|\ \ | |/ |/| | Bump cmake minimum required version to 2.8.12 | ||||
| * | Bump to the *real* minimum required version. Setting CMP0022 breaks CMake ↵ | Walter Gray | 2016-05-26 | 1 | -1/+1 |
| | | | | | | | | versions < 2.8.12 | ||||
* | | Remove __PROTOBUF_PACKAGE_PREFIX | Walter Gray | 2016-05-28 | 1 | -5/+1 |
| | | |||||
* | | remove useless cleanup - config.cmake files are executed in their own context. | Walter Gray | 2016-05-26 | 1 | -4/+0 |
| | | |||||
* | | Remove if(TRUE) | Walter Gray | 2016-05-26 | 1 | -28/+26 |
|/ | |||||
* | added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88 | Jeff Merver | 2016-05-21 | 1 | -1/+1 |
| | |||||
* | add protobuf:: namespace to installed targets | Walter Gray | 2016-05-20 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1576 from wal-rus/cmake-versionfile | Feng Xiao | 2016-05-20 | 1 | -0/+35 |
|\ | | | | | Make protobuf-config-version.cmake.in set the required variables | ||||
| * | Update protobuf-config-version.cmake.in to correctly set the required ↵ | Walter Gray | 2016-05-19 | 1 | -0/+35 |
| | | | | | | | | variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE) | ||||
* | | Fix the cmake configuration file install path to be more standards compliant ↵ | Walter Gray | 2016-05-19 | 1 | -2/+8 |
|/ | | | | (See the description of cmake's config search behavior on https://cmake.org/cmake/help/v3.4/command/find_package.html) | ||||
* | Update file lists. | Jisi Liu | 2016-04-28 | 1 | -0/+5 |
| | |||||
* | Update file list to include the missing extension lite file. | Jisi Liu | 2016-04-18 | 1 | -1/+0 |
| | |||||
* | Merge branch 'master' into internal-merge | Josh Haberman | 2016-04-07 | 1 | -0/+1 |
|\ | |||||
| * | Added access_level for types | Gaurav Vaish | 2016-04-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | * `csharp_options`: Added `Options` to encapsulate generator options. Supported options for now - file_extension, base_namespace * `{Blah}Generator`: Now accept `Options*` as parameter to constructor * `csharp_generator.cc`: Parse and populate options * `Makefile.am`: Added `csharp_options.h` * `extract_includes.bat.in`: Added `csharp_options.h` Refactoring code to two commits. This is the first commit | ||||
* | | Allow bigobj for map_unittest | Jisi Liu | 2016-04-01 | 1 | -0/+2 |
|/ | |||||
* | Clarified that 'nmake' must be run before 'nmake check'. | Josh Haberman | 2016-02-10 | 1 | -1/+2 |
| | |||||
* | Integrate from google internal. | Jisi Liu | 2016-01-29 | 1 | -0/+1 |
| | | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration. | ||||
* | Fix typos in README.md/CHANGES.txt | Dongjoon Hyun | 2016-01-11 | 1 | -3/+3 |
| | |||||
* | Update BUILD/cmake files. | Feng Xiao | 2015-12-28 | 2 | -3/+5 |
| | | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d | ||||
* | Merge branch master into v3.0.0-beta-2 | Feng Xiao | 2015-12-21 | 1 | -0/+2 |
|\ | |||||
| * | MSVC MP flag to build with multiple processes in visual studio. | Benjamin Bennett | 2015-12-07 | 1 | -0/+2 |
| | | |||||
* | | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 3 | -0/+4 |
|/ | |||||
* | Rename "umbrella" to "reflection" consistently. | Jon Skeet | 2015-11-19 | 1 | -1/+1 |
| | | | | This changes csharp_names.h, which will require a corresponding change in GRPC. | ||||
* | Add support for POWER Linux | Doug Kwan | 2015-11-03 | 1 | -1/+1 |
| | |||||
* | Merge pull request #889 from leif81/patch-1 | Feng Xiao | 2015-10-16 | 1 | -10/+10 |
|\ | | | | | Fix typos in cmake README.md | ||||
| * | Change back to "protobuf_BUILD_TESTS" flag | Leif Gruenwoldt | 2015-10-16 | 1 | -1/+1 |
| | | | | | | In anticipation of PR #753 getting merged we'll change this back. However until that PR gets merged the old value "BUILD_TESTS" is really needed. | ||||
| * | Fix typos in cmake README.md | Leif Gruenwoldt | 2015-10-16 | 1 | -11/+11 |
| | | |||||
* | | Merge pull request #783 from podsvirov/topic-cmake-project | Feng Xiao | 2015-10-16 | 5 | -52/+108 |
|\ \ | |/ |/| | Improved CMake project | ||||
| * | Improved SHARED build from CMake project | Konstantin Podsvirov | 2015-10-15 | 4 | -27/+47 |
| | | |||||
| * | Add CMake option protobuf_DEBUG_POSTFIX | Konstantin Podsvirov | 2015-09-17 | 4 | -3/+8 |
| | | |||||
| * | Simplify testing from CMake project to "check" target | Konstantin Podsvirov | 2015-09-17 | 1 | -19/+13 |
| | | |||||
| * | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-16 | 1 | -4/+11 |
| | | | | | | | | | | Build tests optimization Now lite-test added to CTest collection |