Commit graph

12 commits

Author SHA1 Message Date
Mike Kruskal
cac9765af0
Update CMake configuration to add a dependency on Abseil (#10401)
* Rolling https://github.com/protocolbuffers/protobuf/pull/9793 forward

* Removing private label on conformance linkage

* no-op comment added
2022-08-12 16:41:00 -07:00
Adam Cozzette
f7e2e0b301
Remove Abseil dependency from CMake build (#10056)
* Revert "Added cmake abseil include guard"

This reverts commit b6ee841d7c.

* Revert "Update CMake configuration to add a dependency on Abseil (#9793)"

This reverts commit e9246cd789.
2022-05-26 12:13:41 -07:00
David L. Jones
c4ddd84918
Factor out MSVC-only version.rc logic, and ensure other variables are always initialized (#9880) 2022-04-28 15:17:51 -07:00
mkruskal-google
e9246cd789
Update CMake configuration to add a dependency on Abseil (#9793)
* Proof of concept for CMake Abseil dependency

* Hooked up Abseil linking

* Adding test binaries

* Reverting absl::string view use added for testing.  This will still be broken for automake and bazel

* Adding new cmake config to dist list

* Whitespace fixes and an attempt at fix for Windows Python Release (CMake version < 3.13)

* Hook up LTS to windows cmake

* Fix 'git cd' typo

* Adding clarifying comment for fix

* Adding abseil dependency to protobuf-lite too

* Update submodules instead of cloning abseil-cpp

* Adding explicit pointer to abseil root directory

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-17 22:28:01 -04:00
Arfrever Frehtes Taifersar Arahesis
426866285b cmake: Replace protobuf_source_dir variable with protobuf_SOURCE_DIR variable (#9596)
protobuf_source_dir variable is no longer needed and has the same value
as protobuf_SOURCE_DIR variable, which is instance of CMake-standard
<PROJECT-NAME>_SOURCE_DIR variable:
https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
2022-03-09 14:55:55 -08:00
Jorge López Fueyo
1ae531d73b
Disabled version.rc for clang-cl (#8139) 2021-06-04 11:13:56 -07:00
Michael Matthew Mitchell
dface63d71 Swapped libprotoc and libprotobuf
libprotobuf being targed before libprotoc was causing Visual Studio to fail in linking protoc.
2019-01-31 14:35:57 -08:00
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
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
Feng Xiao
4333edb340 Add cmake support. 2015-05-31 02:28:34 -07:00