From 0bbebc85cd8dbd382b10698b3cefe9a01e88e76f Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Fri, 13 Nov 2020 08:47:54 -0800 Subject: Export of internal Abseil changes -- a1b28d83d60f96e14487f093566f12ba07f92732 by Mark Barolak : Import of CCTZ from GitHub. PiperOrigin-RevId: 342270204 -- 3d99c08b7e2ee23050f64965f09881b54821cdd0 by Mark Barolak : 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 --- CMake/AbseilHelpers.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMake/AbseilHelpers.cmake') 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") -- cgit v1.2.3