diff options
author | Vincent Ambo <mail@tazj.in> | 2020-11-21T13·43+0100 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T14·48+0100 |
commit | 082c006c04343a78d87b6c6ab3608c25d6213c3f (patch) | |
tree | 16e6f04f8d1d1d2d67e8e917d5e7bb48c1b60375 /third_party/abseil_cpp/absl/status/CMakeLists.txt | |
parent | cc27324d0226953943f408ce3c69ad7d648e005e (diff) |
merge(3p/absl): subtree merge of Abseil up to e19260f r/1889
... notably, this includes Abseil's own StatusOr type, which conflicted with our implementation (that was taken from TensorFlow). Change-Id: Ie7d6764b64055caaeb8dc7b6b9d066291e6b538f
Diffstat (limited to 'third_party/abseil_cpp/absl/status/CMakeLists.txt')
-rw-r--r-- | third_party/abseil_cpp/absl/status/CMakeLists.txt | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/third_party/abseil_cpp/absl/status/CMakeLists.txt b/third_party/abseil_cpp/absl/status/CMakeLists.txt index 3b8917e030a5..f0d798a3732d 100644 --- a/third_party/abseil_cpp/absl/status/CMakeLists.txt +++ b/third_party/abseil_cpp/absl/status/CMakeLists.txt @@ -19,6 +19,7 @@ absl_cc_library( HDRS "status.h" SRCS + "internal/status_internal.h" "status.cc" "status_payload_printer.h" "status_payload_printer.cc" @@ -39,35 +40,38 @@ absl_cc_library( PUBLIC ) -absl_cc_library( +absl_cc_test( NAME - statusor - HDRS - "statusor.h" + status_test SRCS - "statusor.cc" - "statusor_internals.h" + "status_test.cc" COPTS - ${ABSL_DEFAULT_COPTS} + ${ABSL_TEST_COPTS} DEPS absl::status - absl::atomic_hook - absl::raw_logging_internal absl::strings - PUBLIC + gmock_main ) -absl_cc_test( +absl_cc_library( NAME - status_test + statusor + HDRS + "statusor.h" SRCS - "status_test.cc" + "statusor.cc" + "internal/statusor_internal.h" COPTS - ${ABSL_TEST_COPTS} + ${ABSL_DEFAULT_COPTS} DEPS absl::status + absl::core_headers + absl::raw_logging_internal + absl::type_traits absl::strings - gmock_main + absl::utility + absl::variant + PUBLIC ) absl_cc_test( @@ -80,6 +84,5 @@ absl_cc_test( DEPS absl::status absl::statusor - absl::strings gmock_main ) |