diff options
| author |  Abseil Team <absl-team@google.com> | 2020-11-13 08:47:54 -0800 |
|---|---|---|
| committer |  Mark Barolak <mbar@google.com> | 2020-11-13 12:49:04 -0500 |
| commit | 0bbebc85cd8dbd382b10698b3cefe9a01e88e76f (patch) | |
| tree | 660c7345c1f31827946f855eeef1f4a8498c5086 /CMake | |
| parent | 0453e1653372fd719557aa70eaad34f691e0d5ae (diff) | |
Export of internal Abseil changes
--
a1b28d83d60f96e14487f093566f12ba07f92732 by Mark Barolak <mbar@google.com>:
Import of CCTZ from GitHub.
PiperOrigin-RevId: 342270204
--
3d99c08b7e2ee23050f64965f09881b54821cdd0 by Mark Barolak <mbar@google.com>:
Fix a Windows DLL breakage that is causing all sub-libraries to be compiled as DLL dependencies instead of stand-alone DLLs.
See https://github.com/abseil/abseil-cpp/issues/796 for the bug report.
Import of https://github.com/abseil/abseil-cpp/pull/797
PiperOrigin-RevId: 341892182
GitOrigin-RevId: a1b28d83d60f96e14487f093566f12ba07f92732
Change-Id: I7d70f07492bfa9b657ec280a4f005c1ee893594c
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index c8060709..e85deba8 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -122,7 +122,11 @@ function(absl_cc_library) # 4. "static" -- This target does not depend on the DLL and should be built # statically. if (${ABSL_BUILD_DLL}) - absl_internal_dll_contains(TARGET ${_NAME} OUTPUT _in_dll) + if(ABSL_ENABLE_INSTALL) + absl_internal_dll_contains(TARGET ${_NAME} OUTPUT _in_dll) + else() + absl_internal_dll_contains(TARGET ${ABSL_CC_LIB_NAME} OUTPUT _in_dll) + endif() if (${_in_dll}) # This target should be replaced by the DLL set(_build_type "dll") |