@@ -28,6 +28,8 @@ set(ABSL_INTERNAL_DLL_FILES
2828 "base/internal/low_level_scheduling.h"
2929 "base/internal/nullability_impl.h"
3030 "base/internal/per_thread_tls.h"
31+ "base/internal/poison.cc"
32+ "base/internal/poison.h"
3133 "base/prefetch.h"
3234 "base/internal/pretty_function.h"
3335 "base/internal/raw_logging.cc"
@@ -66,6 +68,7 @@ set(ABSL_INTERNAL_DLL_FILES
6668 "cleanup/internal/cleanup.h"
6769 "container/btree_map.h"
6870 "container/btree_set.h"
71+ "container/hash_container_defaults.h"
6972 "container/fixed_array.h"
7073 "container/flat_hash_map.h"
7174 "container/flat_hash_set.h"
@@ -121,8 +124,13 @@ set(ABSL_INTERNAL_DLL_FILES
121124 "debugging/symbolize.h"
122125 "debugging/internal/address_is_readable.cc"
123126 "debugging/internal/address_is_readable.h"
127+ "debugging/internal/bounded_utf8_length_sequence.h"
128+ "debugging/internal/decode_rust_punycode.cc"
129+ "debugging/internal/decode_rust_punycode.h"
124130 "debugging/internal/demangle.cc"
125131 "debugging/internal/demangle.h"
132+ "debugging/internal/demangle_rust.cc"
133+ "debugging/internal/demangle_rust.h"
126134 "debugging/internal/elf_mem_image.cc"
127135 "debugging/internal/elf_mem_image.h"
128136 "debugging/internal/examine_stack.cc"
@@ -131,6 +139,8 @@ set(ABSL_INTERNAL_DLL_FILES
131139 "debugging/internal/stack_consumption.h"
132140 "debugging/internal/stacktrace_config.h"
133141 "debugging/internal/symbolize.h"
142+ "debugging/internal/utf8_for_code_point.cc"
143+ "debugging/internal/utf8_for_code_point.h"
134144 "debugging/internal/vdso_support.cc"
135145 "debugging/internal/vdso_support.h"
136146 "functional/any_invocable.h"
@@ -311,7 +321,6 @@ set(ABSL_INTERNAL_DLL_FILES
311321 "strings/internal/string_constant.h"
312322 "strings/internal/stringify_sink.h"
313323 "strings/internal/stringify_sink.cc"
314- "strings/internal/has_absl_stringify.h"
315324 "strings/has_absl_stringify.h"
316325 "strings/has_ostream_operator.h"
317326 "strings/match.cc"
@@ -437,9 +446,47 @@ set(ABSL_INTERNAL_DLL_FILES
437446 "debugging/leak_check.cc"
438447)
439448
449+ if (NOT MSVC )
450+ list (APPEND ABSL_INTERNAL_DLL_FILES
451+ "flags/commandlineflag.cc"
452+ "flags/commandlineflag.h"
453+ "flags/config.h"
454+ "flags/declare.h"
455+ "flags/flag.h"
456+ "flags/internal/commandlineflag.cc"
457+ "flags/internal/commandlineflag.h"
458+ "flags/internal/flag.cc"
459+ "flags/internal/flag.h"
460+ "flags/internal/parse.h"
461+ "flags/internal/path_util.h"
462+ "flags/internal/private_handle_accessor.cc"
463+ "flags/internal/private_handle_accessor.h"
464+ "flags/internal/program_name.cc"
465+ "flags/internal/program_name.h"
466+ "flags/internal/registry.h"
467+ "flags/internal/sequence_lock.h"
468+ "flags/internal/usage.cc"
469+ "flags/internal/usage.h"
470+ "flags/marshalling.cc"
471+ "flags/marshalling.h"
472+ "flags/parse.cc"
473+ "flags/parse.h"
474+ "flags/reflection.cc"
475+ "flags/reflection.h"
476+ "flags/usage.cc"
477+ "flags/usage.h"
478+ "flags/usage_config.cc"
479+ "flags/usage_config.h"
480+ "log/flags.cc"
481+ "log/flags.h"
482+ "log/internal/flags.h"
483+ )
484+ endif ()
485+
440486set (ABSL_INTERNAL_DLL_TARGETS
441487 "absl_check"
442488 "absl_log"
489+ "absl_vlog_is_on"
443490 "algorithm"
444491 "algorithm_container"
445492 "any"
@@ -505,6 +552,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
505552 "log_internal_check_op"
506553 "log_internal_conditions"
507554 "log_internal_config"
555+ "log_internal_fnmatch"
508556 "log_internal_format"
509557 "log_internal_globals"
510558 "log_internal_log_impl"
@@ -584,6 +632,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
584632 "strerror"
585633 "strings"
586634 "strings_internal"
635+ "string_view"
587636 "symbolize"
588637 "synchronization"
589638 "thread_pool"
@@ -594,8 +643,30 @@ set(ABSL_INTERNAL_DLL_TARGETS
594643 "type_traits"
595644 "utility"
596645 "variant"
646+ "vlog_config_internal"
647+ "vlog_is_on"
597648)
598649
650+ if (NOT MSVC )
651+ list (APPEND ABSL_INTERNAL_DLL_TARGETS
652+ "flags"
653+ "flags_commandlineflag"
654+ "flags_commandlineflag_internal"
655+ "flags_config"
656+ "flags_internal"
657+ "flags_marshalling"
658+ "flags_parse"
659+ "flags_path_util"
660+ "flags_private_handle_accessor"
661+ "flags_program_name"
662+ "flags_reflection"
663+ "flags_usage"
664+ "flags_usage_internal"
665+ "log_internal_flags"
666+ "log_flags"
667+ )
668+ endif ()
669+
599670set (ABSL_INTERNAL_TEST_DLL_FILES
600671 "hash/hash_testing.h"
601672 "log/scoped_mock_log.cc"
@@ -608,6 +679,9 @@ set(ABSL_INTERNAL_TEST_DLL_FILES
608679 "random/internal/mock_overload_set.h"
609680 "random/mocking_bit_gen.h"
610681 "random/mock_distributions.h"
682+ "status/status_matchers.h"
683+ "status/internal/status_matchers.cc"
684+ "status/internal/status_matchers.h"
611685 "strings/cordz_test_helpers.h"
612686 "strings/cord_test_helpers.h"
613687)
@@ -620,6 +694,7 @@ set(ABSL_INTERNAL_TEST_DLL_TARGETS
620694 "random_internal_distribution_test_util"
621695 "random_internal_mock_overload_set"
622696 "scoped_mock_log"
697+ "status_matchers"
623698)
624699
625700include (CheckCXXSourceCompiles)
@@ -668,12 +743,7 @@ function(absl_internal_dll_contains)
668743
669744 STRING (REGEX REPLACE "^absl::" "" _target ${ABSL_INTERNAL_DLL_TARGET} )
670745
671- list (FIND
672- ABSL_INTERNAL_DLL_TARGETS
673- "${_target} "
674- _index)
675-
676- if (${_index} GREATER -1)
746+ if (_target IN_LIST ABSL_INTERNAL_DLL_TARGETS)
677747 set (${ABSL_INTERNAL_DLL_OUTPUT} 1 PARENT_SCOPE)
678748 else ()
679749 set (${ABSL_INTERNAL_DLL_OUTPUT} 0 PARENT_SCOPE)
@@ -690,12 +760,7 @@ function(absl_internal_test_dll_contains)
690760
691761 STRING (REGEX REPLACE "^absl::" "" _target ${ABSL_INTERNAL_TEST_DLL_TARGET} )
692762
693- list (FIND
694- ABSL_INTERNAL_TEST_DLL_TARGETS
695- "${_target} "
696- _index)
697-
698- if (${_index} GREATER -1)
763+ if (_target IN_LIST ABSL_INTERNAL_TEST_DLL_TARGETS)
699764 set (${ABSL_INTERNAL_TEST_DLL_OUTPUT} 1 PARENT_SCOPE)
700765 else ()
701766 set (${ABSL_INTERNAL_TEST_DLL_OUTPUT} 0 PARENT_SCOPE)
@@ -747,7 +812,12 @@ function(absl_make_dll)
747812 else ()
748813 set (_dll "abseil_dll" )
749814 set (_dll_files ${ABSL_INTERNAL_DLL_FILES} )
750- set (_dll_libs "" )
815+ set (_dll_libs
816+ Threads::Threads
817+ # TODO(#1495): Use $<LINK_LIBRARY:FRAMEWORK,CoreFoundation> once our
818+ # minimum CMake version >= 3.24
819+ $<$<PLATFORM_ID:Darwin>:-Wl,-framework ,CoreFoundation>
820+ )
751821 set (_dll_compile_definitions "" )
752822 set (_dll_includes "" )
753823 set (_dll_consume "ABSL_CONSUME_DLL" )
@@ -765,7 +835,10 @@ function(absl_make_dll)
765835 ${_dll_libs}
766836 ${ABSL_DEFAULT_LINKOPTS}
767837 )
768- set_property (TARGET ${_dll} PROPERTY LINKER_LANGUAGE "CXX" )
838+ set_target_properties (${_dll} PROPERTIES
839+ LINKER_LANGUAGE "CXX"
840+ SOVERSION ${ABSL_SOVERSION}
841+ )
769842 target_include_directories (
770843 ${_dll}
771844 PUBLIC
0 commit comments