diff options
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 7 | ||||
| -rw-r--r-- | absl/base/BUILD.bazel | 1 | ||||
| -rw-r--r-- | absl/base/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | absl/debugging/BUILD.bazel | 1 | ||||
| -rw-r--r-- | absl/hash/hash.h | 2 | ||||
| -rw-r--r-- | absl/types/BUILD.bazel | 1 |
6 files changed, 29 insertions, 6 deletions
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index 96813b083d01..d48703656393 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -48,7 +48,7 @@ function(absl_library) add_library(${_NAME} STATIC ${ABSL_LIB_SOURCES}) - target_compile_options(${_NAME} PRIVATE ${ABSL_COMPILE_CXXFLAGS} ${ABSL_LIB_PRIVATE_COMPILE_FLAGS}) + target_compile_options(${_NAME} PRIVATE ${ABSL_LIB_PRIVATE_COMPILE_FLAGS}) target_link_libraries(${_NAME} PUBLIC ${ABSL_LIB_PUBLIC_LIBRARIES}) target_include_directories(${_NAME} PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_LIB_PUBLIC_INCLUDE_DIRS} @@ -140,9 +140,8 @@ function(absl_cc_library) target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS}) target_include_directories(${_NAME} PUBLIC ${ABSL_COMMON_INCLUDE_DIRS}) - # TODO(rongjiecomputer): Revisit ABSL_COMPILE_CXXFLAGS when fixing GH#123 target_compile_options(${_NAME} - PRIVATE ${ABSL_COMPILE_CXXFLAGS} ${ABSL_CC_LIB_COPTS}) + PRIVATE ${ABSL_CC_LIB_COPTS}) target_link_libraries(${_NAME} PUBLIC ${ABSL_CC_LIB_DEPS} PRIVATE ${ABSL_CC_LIB_LINKOPTS} @@ -245,7 +244,7 @@ function(absl_test) add_executable(${_NAME}_bin ${ABSL_TEST_SOURCES}) - target_compile_options(${_NAME}_bin PRIVATE ${ABSL_COMPILE_CXXFLAGS} ${ABSL_TEST_PRIVATE_COMPILE_FLAGS}) + target_compile_options(${_NAME}_bin PRIVATE ${ABSL_TEST_PRIVATE_COMPILE_FLAGS}) target_link_libraries(${_NAME}_bin PUBLIC ${ABSL_TEST_PUBLIC_LIBRARIES} ${ABSL_TEST_COMMON_LIBRARIES}) target_include_directories(${_NAME}_bin PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_TEST_PUBLIC_INCLUDE_DIRS} diff --git a/absl/base/BUILD.bazel b/absl/base/BUILD.bazel index f7d810135b8c..9b86ce77c7b8 100644 --- a/absl/base/BUILD.bazel +++ b/absl/base/BUILD.bazel @@ -75,7 +75,6 @@ cc_library( copts = ABSL_DEFAULT_COPTS, deps = [ ":config", - ":dynamic_annotations", ], ) diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt index 202003e60e60..3c580d434941 100644 --- a/absl/base/CMakeLists.txt +++ b/absl/base/CMakeLists.txt @@ -130,6 +130,29 @@ absl_library( absl_cc_library( NAME + config + HDRS + "config.h" + "policy_checks.h" + PUBLIC +) + +absl_cc_library( + NAME + core_headers + HDRS + "attributes.h" + "macros.h" + "optimization.h" + "port.h" + "thread_annotations.h" + DEPS + absl::config + PUBLIC +) + +absl_cc_library( + NAME spinlock_wait SRCS "internal/spinlock_wait.cc" diff --git a/absl/debugging/BUILD.bazel b/absl/debugging/BUILD.bazel index e1e7fced69fb..a8ebaea445e0 100644 --- a/absl/debugging/BUILD.bazel +++ b/absl/debugging/BUILD.bazel @@ -149,6 +149,7 @@ cc_library( copts = ABSL_DEFAULT_COPTS, deps = [ "//absl/base", + "//absl/base:core_headers", "//absl/base:dynamic_annotations", ], ) diff --git a/absl/hash/hash.h b/absl/hash/hash.h index 8cbb19e202d5..36c7c2b3b6d2 100644 --- a/absl/hash/hash.h +++ b/absl/hash/hash.h @@ -98,7 +98,7 @@ namespace absl { // * absl::string_view // * absl::InlinedVector // * absl::FixedArray -// * absl::unit128 +// * absl::uint128 // * absl::Time, absl::Duration, and absl::TimeZone // // Note: the list above is not meant to be exhaustive. Additional type support diff --git a/absl/types/BUILD.bazel b/absl/types/BUILD.bazel index 32f690c94c1d..43899ca7ccf7 100644 --- a/absl/types/BUILD.bazel +++ b/absl/types/BUILD.bazel @@ -168,6 +168,7 @@ cc_library( deps = [ ":bad_optional_access", "//absl/base:config", + "//absl/base:core_headers", "//absl/memory", "//absl/meta:type_traits", "//absl/utility", |