From ab3afab813ff0d76c3d85c9c87dc960d827de1c8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 2 Mar 2022 13:43:37 +1100 Subject: [PATCH] avoid building static libs on windows when BUILD_SHARED_LIBS=ON except all flags_* libraries, for which DLL builds on windows are not supported To do this, expand list of ABSL_INTERNAL_DLL_TARGETS; this is due to how the logic of absl_internal_dll_contains checks whether additional static libraries should be built, compare https://github.com/abseil/abseil-cpp/blob/20211102.0/CMake/AbseilHelpers.cmake#L112-L132 --- CMake/AbseilDll.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake index 30069da2..41d72dac 100644 --- a/CMake/AbseilDll.cmake +++ b/CMake/AbseilDll.cmake @@ -382,6 +382,11 @@ set(ABSL_INTERNAL_DLL_TARGETS "container_common" "container_memory" "cord" + "cord_internal" + "cordz_functions" + "cordz_handle" + "cordz_info" + "cordz_sample_token" "core_headers" "counting_allocator" "debugging" @@ -410,6 +415,7 @@ set(ABSL_INTERNAL_DLL_TARGETS "layout" "leak_check" "log_severity" + "low_level_hash" "malloc_internal" "memory" "meta" @@ -424,6 +430,7 @@ set(ABSL_INTERNAL_DLL_TARGETS "random_bit_gen_ref" "random_distributions" "random_internal_distribution_caller" + "random_internal_distribution_test_util" "random_internal_distributions" "random_internal_explicit_seed_seq" "random_internal_fastmath" @@ -459,6 +466,8 @@ set(ABSL_INTERNAL_DLL_TARGETS "stack_consumption" "stacktrace" "status" + "statusor" + "strerror" "str_format" "str_format_internal" "strings"