Commit Graph

19 Commits

Author SHA1 Message Date
Ivan Shynkarenka
291d9a0ab0 Fix issue with version.rc 2018-05-15 23:19:58 +03:00
Jozef Izso
b1fecd0dea Include file information in all DLL and EXE outputs 2018-04-28 00:12:38 +02:00
Jozef Izso
3415201d1d Add file information to Windows binaries 2018-04-27 23:44:38 +02:00
Adam Cozzette
0400cca323 Integrated internal changes from Google 2018-03-13 16:37:29 -07:00
Corentin Le Molgat
f7a05844eb Add CMake ALIAS targets
We follow the findProtobuf.cmake naming convention
to ease the use of protobuf as cmake subproject
2018-02-01 20:31:36 +01:00
Corentin Le Molgat
3bc0282fb6 Add VERSION property to CMake library targets 2018-02-01 20:31:36 +01:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Jisi Liu
12c186f7c6 Fix makefile.am 2017-07-25 14:38:00 -07:00
Jisi Liu
759245a49a Merge from master 2017-07-25 11:52:33 -07:00
Dennis Cappendijk
4eb02fe31e Add headers as part of cmake project
tested only on windows with visual studio 2015 as generator
2017-05-29 17:34:08 +02: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
Jisi Liu
b90f9f8073 Update cmake and BUILD files.
Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
2015-08-25 17:06:33 -07:00
Jisi Liu
c3bc155ace Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
2015-08-21 11:18:45 -07:00
Tom Hughes
6d72d12575 Set cmake include directories on library targets.
cmake targets that depend on these libraries will automatically have
these include directories.
2015-07-28 16:18:35 -07:00
Feng Xiao
818c5eee08 Fix broken builds. 2015-06-17 11:19:46 -07:00
Feng Xiao
e96ff30120 Down-integrate from internal code base.
[ci skip]

Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
2015-06-15 18:24:01 -07:00
Feng Xiao
4333edb340 Add cmake support. 2015-05-31 02:28:34 -07:00