Commit Graph

36 Commits

Author SHA1 Message Date
Corentin Le Molgat
1ec9beb477 Use NEW behaviour for project VERSION variables.
cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
2018-02-01 20:31:50 +01:00
Corentin Le Molgat
8dd0f4e557 Even with MSVC enable zlib support as default behaviour. 2018-02-01 20:31:36 +01:00
Yangqing Jia
cba18efe18 Allow one to omit building libprotoc and protoc binaries 2017-11-13 15:15:39 -08:00
Tim Ebringer
a23669c2f6 Sort MSVC warning suppressions
Add brief documentation describing each warning suppression.
2017-10-21 09:40:32 -04:00
Tim Ebringer
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.
2017-10-06 15:56:30 -04:00
Wojciech Mamrak
37bd5d525b Disable MSVC warning C4309
> warning C4309: static_cast': truncation of constant value

introduced in commit 9db5b11c9c
2017-02-18 15:44:29 +01:00
Wei-Yin Chen (陳威尹)
a7eaf36967 Rename UNICODE to protobuf_UNICODE 2016-09-01 17:18:22 -07:00
Wei-Yin Chen (陳威尹)
588a803d58 Support Unicode build on Windows 2016-08-31 17:28:51 -07:00
Konstantin Podsvirov
eefd1fdd48 CMake: Auto find ZLIB from package config if nedded 2016-08-02 22:37:36 +03:00
Walter Gray
4150a91c14 make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use. 2016-06-09 17:27:46 -07:00
Feng Xiao
6aa981f949 Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning
CMake prerelease versioning
2016-06-07 14:08:03 -07:00
Walter Gray
23fef56e6d Replace handwritten protobuf-targets with exported version. 2016-06-06 12:06:55 -07:00
Konstantin Podsvirov
71556295ff CMake project updates
A series of improvements:

- Improved Protobuf module compatibility (disabled by default);
- Hide advanced settings;
- Added build tree configuration;
- Added build of examples.
2016-06-04 00:10:07 +03:00
Walter Gray
f1091ab1aa Include the prerelease version in the protobuf_VERSION 2016-05-31 17:07:41 -07:00
Walter Gray
c57c6eabf7 Bump to the *real* minimum required version. Setting CMP0022 breaks CMake versions < 2.8.12 2016-05-26 23:39:17 -07:00
Jisi Liu
3b6df0612d Allow bigobj for map_unittest 2016-04-01 15:02:45 -07:00
Benjamin Bennett
9fc4d90cab MSVC MP flag to build with multiple processes in visual studio. 2015-12-07 13:54:02 -06:00
Konstantin Podsvirov
c3aa4c2675 Improved SHARED build from CMake project 2015-10-15 02:56:48 +03:00
Konstantin Podsvirov
f397ede7c6 Add CMake option protobuf_DEBUG_POSTFIX 2015-09-17 13:00:12 +03:00
Konstantin Podsvirov
0a22fe59b7 Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS 2015-09-15 15:36:20 +03:00
Konstantin Podsvirov
620bd7418d Rename CMake option ZLIB to protobuf_WITH_ZLIB 2015-09-15 15:31:25 +03:00
Konstantin Podsvirov
673d32e093 Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS 2015-09-15 15:30:02 +03:00
Konstantin Podsvirov
905f464035 Using NEW behavior for CMP0022 in CMake project 2015-09-01 16:44:48 +03:00
Konstantin Podsvirov
d79e0379f2 Option for switching static runtime link policy with MSVC 2015-09-01 15:00:00 +03:00
Konstantin Podsvirov
20b882d469 Using find_package(ZLIB) with MSVC too 2015-08-31 16:23:40 +03:00
Konstantin Podsvirov
db01460042 Improved configure.ac parsing 2015-08-31 15:20:18 +03:00
Feng Xiao
f818183f9b Merge pull request #673 from podsvirov/topic-cmake-install
Install protobuf from cmake project
2015-08-12 23:07:54 -07:00
Jan Tattermusch
9bdeba479b only link runtime libraries statically for a static build 2015-08-12 12:47:02 -07:00
Jan Tattermusch
1858ac9b42 make VS build link runtime statically 2015-08-08 19:56:52 -07:00
Konstantin Podsvirov
743ec448c5 Parsing version from configure.ac for CMake project 2015-08-01 02:01:42 +03:00
Konstantin Podsvirov
82983433cf Install protobuf from cmake project
Additional export as "protobuf" package
for importing from other cmake projects
2015-07-31 23:36:00 +03:00
Jisi Liu
78d470c7a5 Make the code independent of config.h
Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather
than providing a config.h

- Make pbconfig.h a manually written file to handle hash conditions
  according to platform related macros.
- Remove #include "config.h" from source code.
- Changed the configure.ac and Makefile.am to pass down the macros.
- Change cmake to pass down the the macros.

Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
2015-06-16 18:27:36 -07:00
Feng Xiao
dffd542bb8 Update ./update_file_lists.sh.
Make it executable and generate extract_includes.bat in the same directory.
2015-06-05 23:36:05 -07:00
Feng Xiao
e9839ff444 Add back incorrectly excluded cmake targets. 2015-06-05 21:24:23 -07:00
Feng Xiao
34448fca45 Add an cmake option to exclude tests. 2015-06-04 01:27:19 -07:00
Feng Xiao
4333edb340 Add cmake support. 2015-05-31 02:28:34 -07:00