Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #1613 from yeswalrus/cmake-min-version | Feng Xiao | 2016-05-31 |
|\ | | | | | Bump cmake minimum required version to 2.8.12 | ||
* | | Remove __PROTOBUF_PACKAGE_PREFIX | Walter Gray | 2016-05-28 |
| | | |||
* | | remove useless cleanup - config.cmake files are executed in their own context. | Walter Gray | 2016-05-26 |
| | | |||
| * | Bump to the *real* minimum required version. Setting CMP0022 breaks CMake ↵ | Walter Gray | 2016-05-26 |
| | | | | | | | | versions < 2.8.12 | ||
* | | Remove if(TRUE) | Walter Gray | 2016-05-26 |
|/ | |||
* | added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88 | Jeff Merver | 2016-05-21 |
| | |||
* | add protobuf:: namespace to installed targets | Walter Gray | 2016-05-20 |
| | |||
* | Merge pull request #1576 from wal-rus/cmake-versionfile | Feng Xiao | 2016-05-20 |
|\ | | | | | 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 |
| | | | | | | | | 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 |
|/ | | | | (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 |
| | |||
* | Update file list to include the missing extension lite file. | Jisi Liu | 2016-04-18 |
| | |||
* | Merge branch 'master' into internal-merge | Josh Haberman | 2016-04-07 |
|\ | |||
| * | Added access_level for types | Gaurav Vaish | 2016-04-05 |
| | | | | | | | | | | | | | | | | | | | | | | * `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 |
|/ | |||
* | Clarified that 'nmake' must be run before 'nmake check'. | Josh Haberman | 2016-02-10 |
| | |||
* | Integrate from google internal. | Jisi Liu | 2016-01-29 |
| | | | | | 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 |
| | |||
* | Update BUILD/cmake files. | Feng Xiao | 2015-12-28 |
| | | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d | ||
* | Merge branch master into v3.0.0-beta-2 | Feng Xiao | 2015-12-21 |
|\ | |||
* | | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 |
| | | |||
| * | MSVC MP flag to build with multiple processes in visual studio. | Benjamin Bennett | 2015-12-07 |
|/ | |||
* | Rename "umbrella" to "reflection" consistently. | Jon Skeet | 2015-11-19 |
| | | | | This changes csharp_names.h, which will require a corresponding change in GRPC. | ||
* | Add support for POWER Linux | Doug Kwan | 2015-11-03 |
| | |||
* | Merge pull request #889 from leif81/patch-1 | Feng Xiao | 2015-10-16 |
|\ | | | | | Fix typos in cmake README.md | ||
| * | Change back to "protobuf_BUILD_TESTS" flag | Leif Gruenwoldt | 2015-10-16 |
| | | | | | | 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. | ||
* | | Merge pull request #783 from podsvirov/topic-cmake-project | Feng Xiao | 2015-10-16 |
|\ \ | | | | | | | Improved CMake project | ||
| | * | Fix typos in cmake README.md | Leif Gruenwoldt | 2015-10-16 |
| |/ |/| | |||
| * | Improved SHARED build from CMake project | Konstantin Podsvirov | 2015-10-15 |
| | | |||
* | | Update cmake/README.md for #783 PR | Konstantin Podsvirov | 2015-10-09 |
| | | |||
* | | First pass at generating XML documentation from .proto comments. | Jon Skeet | 2015-10-01 |
| | | | | | | | | | | | | This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing. Generated code changes coming in next commit. | ||
| * | Add CMake option protobuf_DEBUG_POSTFIX | Konstantin Podsvirov | 2015-09-17 |
| | | |||
| * | Simplify testing from CMake project to "check" target | Konstantin Podsvirov | 2015-09-17 |
| | | |||
| * | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-16 |
| | | | | | | | | | | Build tests optimization Now lite-test added to CTest collection | ||
| * | Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS | Konstantin Podsvirov | 2015-09-15 |
| | | |||
| * | Rename CMake option ZLIB to protobuf_WITH_ZLIB | Konstantin Podsvirov | 2015-09-15 |
| | | |||
| * | Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS | Konstantin Podsvirov | 2015-09-15 |
| | | |||
| * | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-15 |
| | | |||
| * | Using NEW behavior for CMP0022 in CMake project | Konstantin Podsvirov | 2015-09-01 |
| | | |||
| * | Option for switching static runtime link policy with MSVC | Konstantin Podsvirov | 2015-09-01 |
| | | |||
| * | Using find_package(ZLIB) with MSVC too | Konstantin Podsvirov | 2015-08-31 |
| | | |||
| * | Improved configure.ac parsing | Konstantin Podsvirov | 2015-08-31 |
|/ | |||
* | Fix bugs on windows | Bo Yang | 2015-08-25 |
| | |||
* | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 |
| | |||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 |
| | |||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 |
|\ | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525 | ||
* | | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 |
| | | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||
| * | Merge pull request #673 from podsvirov/topic-cmake-install | Feng Xiao | 2015-08-12 |
| |\ | | | | | | | Install protobuf from cmake project | ||
| * | | only link runtime libraries statically for a static build | Jan Tattermusch | 2015-08-12 |
| | | | |||
| * | | make VS build link runtime statically | Jan Tattermusch | 2015-08-08 |
| | | |