@@ -28,6 +28,8 @@ set(ABSL_INTERNAL_DLL_FILES
28
28
"base/internal/low_level_scheduling.h"
29
29
"base/internal/nullability_impl.h"
30
30
"base/internal/per_thread_tls.h"
31
+ "base/internal/poison.cc"
32
+ "base/internal/poison.h"
31
33
"base/prefetch.h"
32
34
"base/internal/pretty_function.h"
33
35
"base/internal/raw_logging.cc"
@@ -66,6 +68,7 @@ set(ABSL_INTERNAL_DLL_FILES
66
68
"cleanup/internal/cleanup.h"
67
69
"container/btree_map.h"
68
70
"container/btree_set.h"
71
+ "container/hash_container_defaults.h"
69
72
"container/fixed_array.h"
70
73
"container/flat_hash_map.h"
71
74
"container/flat_hash_set.h"
@@ -121,8 +124,13 @@ set(ABSL_INTERNAL_DLL_FILES
121
124
"debugging/symbolize.h"
122
125
"debugging/internal/address_is_readable.cc"
123
126
"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"
124
130
"debugging/internal/demangle.cc"
125
131
"debugging/internal/demangle.h"
132
+ "debugging/internal/demangle_rust.cc"
133
+ "debugging/internal/demangle_rust.h"
126
134
"debugging/internal/elf_mem_image.cc"
127
135
"debugging/internal/elf_mem_image.h"
128
136
"debugging/internal/examine_stack.cc"
@@ -131,6 +139,8 @@ set(ABSL_INTERNAL_DLL_FILES
131
139
"debugging/internal/stack_consumption.h"
132
140
"debugging/internal/stacktrace_config.h"
133
141
"debugging/internal/symbolize.h"
142
+ "debugging/internal/utf8_for_code_point.cc"
143
+ "debugging/internal/utf8_for_code_point.h"
134
144
"debugging/internal/vdso_support.cc"
135
145
"debugging/internal/vdso_support.h"
136
146
"functional/any_invocable.h"
@@ -311,7 +321,6 @@ set(ABSL_INTERNAL_DLL_FILES
311
321
"strings/internal/string_constant.h"
312
322
"strings/internal/stringify_sink.h"
313
323
"strings/internal/stringify_sink.cc"
314
- "strings/internal/has_absl_stringify.h"
315
324
"strings/has_absl_stringify.h"
316
325
"strings/has_ostream_operator.h"
317
326
"strings/match.cc"
@@ -437,9 +446,47 @@ set(ABSL_INTERNAL_DLL_FILES
437
446
"debugging/leak_check.cc"
438
447
)
439
448
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
+
440
486
set (ABSL_INTERNAL_DLL_TARGETS
441
487
"absl_check"
442
488
"absl_log"
489
+ "absl_vlog_is_on"
443
490
"algorithm"
444
491
"algorithm_container"
445
492
"any"
@@ -505,6 +552,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
505
552
"log_internal_check_op"
506
553
"log_internal_conditions"
507
554
"log_internal_config"
555
+ "log_internal_fnmatch"
508
556
"log_internal_format"
509
557
"log_internal_globals"
510
558
"log_internal_log_impl"
@@ -584,6 +632,7 @@ set(ABSL_INTERNAL_DLL_TARGETS
584
632
"strerror"
585
633
"strings"
586
634
"strings_internal"
635
+ "string_view"
587
636
"symbolize"
588
637
"synchronization"
589
638
"thread_pool"
@@ -594,8 +643,30 @@ set(ABSL_INTERNAL_DLL_TARGETS
594
643
"type_traits"
595
644
"utility"
596
645
"variant"
646
+ "vlog_config_internal"
647
+ "vlog_is_on"
597
648
)
598
649
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
+
599
670
set (ABSL_INTERNAL_TEST_DLL_FILES
600
671
"hash/hash_testing.h"
601
672
"log/scoped_mock_log.cc"
@@ -608,6 +679,9 @@ set(ABSL_INTERNAL_TEST_DLL_FILES
608
679
"random/internal/mock_overload_set.h"
609
680
"random/mocking_bit_gen.h"
610
681
"random/mock_distributions.h"
682
+ "status/status_matchers.h"
683
+ "status/internal/status_matchers.cc"
684
+ "status/internal/status_matchers.h"
611
685
"strings/cordz_test_helpers.h"
612
686
"strings/cord_test_helpers.h"
613
687
)
@@ -620,6 +694,7 @@ set(ABSL_INTERNAL_TEST_DLL_TARGETS
620
694
"random_internal_distribution_test_util"
621
695
"random_internal_mock_overload_set"
622
696
"scoped_mock_log"
697
+ "status_matchers"
623
698
)
624
699
625
700
include (CheckCXXSourceCompiles)
@@ -668,12 +743,7 @@ function(absl_internal_dll_contains)
668
743
669
744
STRING (REGEX REPLACE "^absl::" "" _target ${ABSL_INTERNAL_DLL_TARGET} )
670
745
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)
677
747
set (${ABSL_INTERNAL_DLL_OUTPUT} 1 PARENT_SCOPE)
678
748
else ()
679
749
set (${ABSL_INTERNAL_DLL_OUTPUT} 0 PARENT_SCOPE)
@@ -690,12 +760,7 @@ function(absl_internal_test_dll_contains)
690
760
691
761
STRING (REGEX REPLACE "^absl::" "" _target ${ABSL_INTERNAL_TEST_DLL_TARGET} )
692
762
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)
699
764
set (${ABSL_INTERNAL_TEST_DLL_OUTPUT} 1 PARENT_SCOPE)
700
765
else ()
701
766
set (${ABSL_INTERNAL_TEST_DLL_OUTPUT} 0 PARENT_SCOPE)
@@ -747,7 +812,12 @@ function(absl_make_dll)
747
812
else ()
748
813
set (_dll "abseil_dll" )
749
814
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
+ )
751
821
set (_dll_compile_definitions "" )
752
822
set (_dll_includes "" )
753
823
set (_dll_consume "ABSL_CONSUME_DLL" )
@@ -765,7 +835,10 @@ function(absl_make_dll)
765
835
${_dll_libs}
766
836
${ABSL_DEFAULT_LINKOPTS}
767
837
)
768
- set_property (TARGET ${_dll} PROPERTY LINKER_LANGUAGE "CXX" )
838
+ set_target_properties (${_dll} PROPERTIES
839
+ LINKER_LANGUAGE "CXX"
840
+ SOVERSION ${ABSL_SOVERSION}
841
+ )
769
842
target_include_directories (
770
843
${_dll}
771
844
PUBLIC
0 commit comments