aboutsummaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Removed handling for ALIASED targets since they are unused.Walter Gray2016-06-071-24/+9
|
* Merge pull request #1624 from yeswalrus/cmake-prerelease-versioningFeng Xiao2016-06-072-17/+30
|\ | | | | CMake prerelease versioning
| * For prerelease versions, require protobuf_FIND_VERSION to be set.Walter Gray2016-05-311-16/+22
| |
| * Include the prerelease version in the protobuf_VERSIONWalter Gray2016-05-311-1/+8
| |
* | Replace handwritten protobuf-targets with exported version.Walter Gray2016-06-063-39/+24
| |
* | Use ExternalProject_Add to build the examples in a stand-alone fashion.Walter Gray2016-06-061-2/+49
| |
* | CMake project updatesKonstantin Podsvirov2016-06-048-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 changesBo Yang2016-06-021-0/+1
| |
* | Merge pull request #1613 from yeswalrus/cmake-min-versionFeng Xiao2016-05-311-1/+1
|\ \ | |/ |/| Bump cmake minimum required version to 2.8.12
| * Bump to the *real* minimum required version. Setting CMP0022 breaks CMake ↵Walter Gray2016-05-261-1/+1
| | | | | | | | versions < 2.8.12
* | Remove __PROTOBUF_PACKAGE_PREFIXWalter Gray2016-05-281-5/+1
| |
* | remove useless cleanup - config.cmake files are executed in their own context.Walter Gray2016-05-261-4/+0
| |
* | Remove if(TRUE)Walter Gray2016-05-261-28/+26
|/
* added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88Jeff Merver2016-05-211-1/+1
|
* add protobuf:: namespace to installed targetsWalter Gray2016-05-201-0/+1
|
* Merge pull request #1576 from wal-rus/cmake-versionfileFeng Xiao2016-05-201-0/+35
|\ | | | | Make protobuf-config-version.cmake.in set the required variables
| * Update protobuf-config-version.cmake.in to correctly set the required ↵Walter Gray2016-05-191-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 Gray2016-05-191-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 Liu2016-04-281-0/+5
|
* Update file list to include the missing extension lite file.Jisi Liu2016-04-181-1/+0
|
* Merge branch 'master' into internal-mergeJosh Haberman2016-04-071-0/+1
|\
| * Added access_level for typesGaurav Vaish2016-04-051-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_unittestJisi Liu2016-04-011-0/+2
|/
* Clarified that 'nmake' must be run before 'nmake check'.Josh Haberman2016-02-101-1/+2
|
* Integrate from google internal.Jisi Liu2016-01-291-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.txtDongjoon Hyun2016-01-111-3/+3
|
* Update BUILD/cmake files.Feng Xiao2015-12-282-3/+5
| | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-211-0/+2
|\
| * MSVC MP flag to build with multiple processes in visual studio.Benjamin Bennett2015-12-071-0/+2
| |
* | Down-integrate from internal code base.Feng Xiao2015-12-113-0/+4
|/
* Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-191-1/+1
| | | | This changes csharp_names.h, which will require a corresponding change in GRPC.
* Add support for POWER LinuxDoug Kwan2015-11-031-1/+1
|
* Merge pull request #889 from leif81/patch-1Feng Xiao2015-10-161-10/+10
|\ | | | | Fix typos in cmake README.md
| * Change back to "protobuf_BUILD_TESTS" flagLeif Gruenwoldt2015-10-161-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.mdLeif Gruenwoldt2015-10-161-11/+11
| |
* | Merge pull request #783 from podsvirov/topic-cmake-projectFeng Xiao2015-10-165-52/+108
|\ \ | |/ |/| Improved CMake project
| * Improved SHARED build from CMake projectKonstantin Podsvirov2015-10-154-27/+47
| |
| * Add CMake option protobuf_DEBUG_POSTFIXKonstantin Podsvirov2015-09-174-3/+8
| |
| * Simplify testing from CMake project to "check" targetKonstantin Podsvirov2015-09-171-19/+13
| |
| * Improved testing from CMake projectKonstantin Podsvirov2015-09-161-4/+11
| | | | | | | | | | Build tests optimization Now lite-test added to CTest collection
| * Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBSKonstantin Podsvirov2015-09-151-4/+4
| |
| * Rename CMake option ZLIB to protobuf_WITH_ZLIBKonstantin Podsvirov2015-09-151-5/+5
| |
| * Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTSKonstantin Podsvirov2015-09-151-3/+3
| |
| * Improved testing from CMake projectKonstantin Podsvirov2015-09-151-3/+13
| |
| * Using NEW behavior for CMP0022 in CMake projectKonstantin Podsvirov2015-09-011-0/+3
| |
| * Option for switching static runtime link policy with MSVCKonstantin Podsvirov2015-09-011-7/+10
| |
| * Using find_package(ZLIB) with MSVC tooKonstantin Podsvirov2015-08-311-12/+14
| |
| * Improved configure.ac parsingKonstantin Podsvirov2015-08-311-15/+27
| |
* | Update cmake/README.md for #783 PRKonstantin Podsvirov2015-10-091-76/+272
| |
* | First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-011-0/+1
|/ | | | | | 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.