1 files changed, 31 insertions, 16 deletions
diff --git a/absl/debugging/CMakeLists.txt b/absl/debugging/CMakeLists.txt
index 001e2727..77336159 100644
--- a/absl/debugging/CMakeLists.txt
+++ b/absl/debugging/CMakeLists.txt
@@ -19,13 +19,21 @@ absl_cc_library(
     stacktrace
   HDRS
     "stacktrace.h"
+    "internal/stacktrace_aarch64-inl.inc"
+    "internal/stacktrace_arm-inl.inc"
+    "internal/stacktrace_config.h"
+    "internal/stacktrace_generic-inl.inc"
+    "internal/stacktrace_powerpc-inl.inc"
+    "internal/stacktrace_unimplemented-inl.inc"
+    "internal/stacktrace_win32-inl.inc"
+    "internal/stacktrace_x86-inl.inc"
   SRCS
     "stacktrace.cc"
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
     absl::debugging_internal
-    absl::base
+    absl::config
     absl::core_headers
   PUBLIC
 )
@@ -45,13 +53,16 @@ absl_cc_library(
     ${ABSL_DEFAULT_COPTS}
   LINKOPTS
     ${ABSL_DEFAULT_LINKOPTS}
+    $<$<BOOL:${MINGW}>:"dbghelp">
   DEPS
     absl::debugging_internal
     absl::demangle_internal
     absl::base
+    absl::config
     absl::core_headers
     absl::dynamic_annotations
     absl::malloc_internal
+    absl::raw_logging_internal
   PUBLIC
 )
 
@@ -62,12 +73,16 @@ absl_cc_test(
     "symbolize_test.cc"
   COPTS
     ${ABSL_TEST_COPTS}
+    $<$<BOOL:${MSVC}>:-Z7>
+  LINKOPTS
+    $<$<BOOL:${MSVC}>:-DEBUG>
   DEPS
     absl::stack_consumption
     absl::symbolize
     absl::base
     absl::core_headers
     absl::memory
+    absl::raw_logging_internal
     gmock
 )
 
@@ -83,8 +98,9 @@ absl_cc_library(
   DEPS
     absl::stacktrace
     absl::symbolize
-    absl::base
+    absl::config
     absl::core_headers
+    absl::raw_logging_internal
 )
 
 absl_cc_library(
@@ -102,6 +118,8 @@ absl_cc_library(
     absl::base
     absl::config
     absl::core_headers
+    absl::errno_saver
+    absl::raw_logging_internal
   PUBLIC
 )
 
@@ -116,8 +134,8 @@ absl_cc_test(
     absl::failure_signal_handler
     absl::stacktrace
     absl::symbolize
-    absl::base
     absl::strings
+    absl::raw_logging_internal
     Threads::Threads
     gmock
 )
@@ -128,14 +146,6 @@ absl_cc_library(
   HDRS
     "internal/address_is_readable.h"
     "internal/elf_mem_image.h"
-    "internal/stacktrace_aarch64-inl.inc"
-    "internal/stacktrace_arm-inl.inc"
-    "internal/stacktrace_config.h"
-    "internal/stacktrace_generic-inl.inc"
-    "internal/stacktrace_powerpc-inl.inc"
-    "internal/stacktrace_unimplemented-inl.inc"
-    "internal/stacktrace_win32-inl.inc"
-    "internal/stacktrace_x86-inl.inc"
     "internal/vdso_support.h"
   SRCS
     "internal/address_is_readable.cc"
@@ -144,9 +154,11 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
-    absl::base
     absl::core_headers
+    absl::config
     absl::dynamic_annotations
+    absl::errno_saver
+    absl::raw_logging_internal
 )
 
 absl_cc_library(
@@ -174,9 +186,9 @@ absl_cc_test(
   DEPS
     absl::demangle_internal
     absl::stack_consumption
-    absl::base
     absl::core_headers
     absl::memory
+    absl::raw_logging_internal
     gmock_main
 )
 
@@ -190,6 +202,7 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
+    absl::config
     absl::core_headers
   PUBLIC
 )
@@ -236,7 +249,7 @@ absl_cc_test(
   SRCS
     "leak_check_test.cc"
   COPTS
-    ${ABSL_DEFAULT_COPTS}
+    ${ABSL_TEST_COPTS}
     "$<$<BOOL:${ABSL_HAVE_LSAN}>:-DABSL_EXPECT_LEAK_SANITIZER>"
   LINKOPTS
     "${ABSL_LSAN_LINKOPTS}"
@@ -273,6 +286,7 @@ absl_cc_test(
     absl::leak_check_api_enabled_for_testing
     absl::leak_check_disable
     absl::base
+    absl::raw_logging_internal
     gmock_main
 )
 
@@ -286,8 +300,9 @@ absl_cc_library(
   COPTS
     ${ABSL_DEFAULT_COPTS}
   DEPS
-    absl::base
+    absl::config
     absl::core_headers
+    absl::raw_logging_internal
   TESTONLY
 )
 
@@ -300,8 +315,8 @@ absl_cc_test(
     ${ABSL_TEST_COPTS}
   DEPS
     absl::stack_consumption
-    absl::base
     absl::core_headers
+    absl::raw_logging_internal
     gmock_main
 )