diff options
| author |  Abseil Team <absl-team@google.com> | 2021-05-03 07:37:39 -0700 |
|---|---|---|
| committer |  Andy Getz <durandal@google.com> | 2021-05-03 13:37:29 -0400 |
| commit | a9831f1cbf93fb18dd951453635f488037454ce9 (patch) | |
| tree | d3fe4e3b09f9e62f4f08c19d1b5abac9fa4e81b3 /CMake | |
| parent | 5dd240724366295970c613ed23d0092bcf392f18 (diff) | |
Export of internal Abseil changes
--
cf88f9cf40eab54c06bca7f20795352ec23bb583 by Derek Mauro <dmauro@google.com>:
Fixes build with latest glibc
Fixes #952
PiperOrigin-RevId: 371693908
--
99bcd0f4a747ce7a401e23c745adf34d0ec5131b by Samuel Benzaquen <sbenza@google.com>:
Add support for std::string_view in StrFormat even when
absl::string_view != std::string_view.
PiperOrigin-RevId: 371693633
--
e35463572149a6c2d4a0d439b9300ce03fd6b96d by Abseil Team <absl-team@google.com>:
Cmake builds should only install pkg-config when explicitly requested.
PiperOrigin-RevId: 371403419
GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583
Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index 1f754392..1a80b5b4 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -141,7 +141,8 @@ function(absl_cc_library) endif() # Generate a pkg-config file for every library: - if(_build_type STREQUAL "static" OR _build_type STREQUAL "shared") + if((_build_type STREQUAL "static" OR _build_type STREQUAL "shared") + AND ABSL_ENABLE_INSTALL) if(NOT ABSL_CC_LIB_TESTONLY) if(absl_VERSION) set(PC_VERSION "${absl_VERSION}") |