Changes imported from Abseil "staging" branch:

- c77facb7ba7c12d656e213e5d63d7dcd9d1f56ba Present the Writer* methods as an option, rather than an ... by Abseil Team <absl-team@google.com>
  - c6004d718f185868dee2ec48b4de6425399b062d Split exception_safety_testing out into its own cmake rul... by Jon Cohen <cohenjon@google.com>
  - 9aa6fc7b34674472d808ed8021f3b20faea82f78 Downstream https://github.com/abseil/abseil-cpp/pull/69 by Jon Cohen <cohenjon@google.com>
  - 13d340269f284b815cc409d2271099e535f4cba4 Internal change by Jon Cohen <cohenjon@google.com>
  - 51840a9243ac9d47eb3c177398d10bb3341f3230 Fix assertion in conversion from floating point types to ... by Alex Strelnikov <strel@google.com>

GitOrigin-RevId: c77facb7ba7c12d656e213e5d63d7dcd9d1f56ba
Change-Id: I7590561b04a986ffbec7139bb9c3aea319a3b975
This commit is contained in:
Abseil Team 2018-01-30 13:05:25 -08:00 committed by Jon Cohen
parent e5c6ee2d00
commit f4f238b09b
7 changed files with 34 additions and 19 deletions

View file

@ -62,7 +62,6 @@ list(APPEND BASE_INTERNAL_HEADERS
# absl_base main library
list(APPEND BASE_SRC
"internal/cycleclock.cc"
"internal/exception_safety_testing.cc"
"internal/raw_logging.cc"
"internal/spinlock.cc"
"internal/sysinfo.cc"
@ -117,6 +116,28 @@ absl_library(
throw_delegate
)
if(BUILD_TESTING)
# exception-safety testing library
set(EXCEPTION_SAFETY_TESTING_SRC "internal/exception_safety_testing.cc")
set(EXCEPTION_SAFETY_TESTING_PUBLIC_LIBRARIES
${ABSL_TEST_COMMON_LIBRARIES}
absl::base
absl::memory
absl::meta
absl::strings
absl::types
)
absl_library(
TARGET
absl_base_internal_exception_safety_testing
SOURCES
${EXCEPTION_SAFETY_TESTING_SRC}
PUBLIC_LIBRARIES
${EXCEPTION_SAFETY_TESTING_PUBLIC_LIBRARIES}
)
endif()
# dynamic_annotations library
set(DYNAMIC_ANNOTATIONS_SRC "dynamic_annotations.cc")