11diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
2- index 624a3c7..dfe0680 100644
2+ index 61e1ae4..3e6ec94 100644
33--- a/CMake/AbseilHelpers.cmake
44+++ b/CMake/AbseilHelpers.cmake
5- @@ -326,7 +326,12 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
6- )
7-
8- if (_build_type STREQUAL "dll")
9- + if (${_in_dll})
10- set(ABSL_CC_LIB_DEPS abseil_dll)
11- + endif()
12- + if(${_in_test_dll})
13- + set(ABSL_CC_LIB_DEPS abseil_test_dll)
14- + endif()
15- endif()
16-
17- target_link_libraries(${_NAME}
18- @@ -345,7 +350,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
5+ @@ -350,7 +350,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
196 endif()
207 endif()
218
@@ -25,7 +12,7 @@ index 624a3c7..dfe0680 100644
2512 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
2613 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
2714diff --git a/CMakeLists.txt b/CMakeLists.txt
28- index 1e7c856..a3c3dae 100644
15+ index 26dc8e7..cd4fef1 100644
2916--- a/CMakeLists.txt
3017+++ b/CMakeLists.txt
3118@@ -145,7 +145,7 @@ if((BUILD_TESTING AND ABSL_BUILD_TESTING) OR ABSL_BUILD_TEST_HELPERS)
@@ -37,23 +24,15 @@ index 1e7c856..a3c3dae 100644
3724 endif()
3825 endif()
3926 else()
40- diff --git a/absl/flags/declare.h b/absl/flags/declare.h
41- index 8d2a856..a154046 100644
42- --- a/absl/flags/declare.h
43- +++ b/absl/flags/declare.h
44- @@ -59,10 +59,15 @@ ABSL_NAMESPACE_END
45-
46- // Internal implementation of ABSL_DECLARE_FLAG to allow macro expansion of its
47- // arguments. Clients must use ABSL_DECLARE_FLAG instead.
48- + #if defined(_MSC_VER)
49- + #define ABSL_DECLARE_FLAG_INTERNAL(type, name) \
50- + extern absl::Flag<type> FLAGS_##name
51- + #else
52- #define ABSL_DECLARE_FLAG_INTERNAL(type, name) \
53- extern absl::Flag<type> FLAGS_##name; \
54- namespace absl /* block flags in namespaces */ {} \
55- /* second redeclaration is to allow applying attributes */ \
56- extern absl::Flag<type> FLAGS_##name
57- + #endif // _MSC_VER
27+ diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
28+ index 365c6ea..d12e585 100644
29+ --- a/absl/container/CMakeLists.txt
30+ +++ b/absl/container/CMakeLists.txt
31+ @@ -1119,6 +1119,7 @@ absl_cc_library(
32+ absl::config
33+ absl::test_instance_tracker
34+ GTest::gmock
35+ + TESTONLY
36+ )
5837
59- #endif // ABSL_FLAGS_DECLARE_H_
38+ absl_cc_library(
0 commit comments