Skip to content

Commit

Permalink
Export of internal Abseil changes.
Browse files Browse the repository at this point in the history
--
da04b8cd21f6225d71397471474d34a77df0efd6 by Jon Cohen <cohenjon@google.com>:

Don't use std::any, std::optional, std::variant, and friends on MacOS versions older than 10.14.

Although Xcode 10 includes those headers and makes the types available to use, according to https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes, on MacOS 10.13 and earlier use of any functions (std::get, for example) results in an error message to upgrade to MacOS 10.14.

This fixes abseil#207.  See that issue for more information on the error generated.

PiperOrigin-RevId: 221844618

--
1d99f77b4c60c5b0d7984f46e8ed63a3f969c635 by Jon Cohen <cohenjon@google.com>:

raw_hash_set_test is still flaky under gcc 4.8.  Since we now have the probe_test, we don't need the PerfectRatio tests.  Just remove them.

PiperOrigin-RevId: 221843042

--
135cbb2a5d90963256518b3b59fe6710815e5dfa by Abseil Team <absl-team@google.com>:

Update absl/algorithm/CMakeLists.txt to use new functions
i.e. absl_cc_(library|test)

PiperOrigin-RevId: 221828348

--
1a5abde4f17f998ae89d87155d59f982a70202d8 by Jon Cohen <cohenjon@google.com>:

Internal change

PiperOrigin-RevId: 221708245

--
e03e031d4de39275989f695c768b0940cce1ff16 by Matt Armstrong <marmstrong@google.com>:

Log to FATAL in throw_delegate.h

ABSL_RAW_LOG(FATAL, ...) is guaranteed to abort.
Previously, the code was logging to ERROR and
calling abort() explicitly, which defeated any
integration with absl::raw_logging_internal::AbortHook().

These changes are limited to Abseil internal APIs.

PiperOrigin-RevId: 221696513

--
d13691523a3f9a5367fd1194cf9604bf4a969029 by Shahriar Rouf <nafi@google.com>:

Import of CCTZ from GitHub.

PiperOrigin-RevId: 221694877

--
f4044c56d44ba0ac2a9f218ed55f1b1f9e985eae by Abseil Team <absl-team@google.com>:

Update absl/base/CMakeLists.txt to use new functions
i.e. absl_cc_(library|test)

PiperOrigin-RevId: 221676669
GitOrigin-RevId: da04b8cd21f6225d71397471474d34a77df0efd6
Change-Id: If6621e10d096a39b6a056a072c2727a0df0b0620
  • Loading branch information
Abseil Team authored and Jon Cohen committed Nov 16, 2018
1 parent a06c4a1 commit f6ae816
Show file tree
Hide file tree
Showing 9 changed files with 384 additions and 481 deletions.
20 changes: 12 additions & 8 deletions CMake/AbseilHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ endfunction()
# DEFINES: List of public defines
# LINKOPTS: List of link options
# PUBLIC: Add this so that this library will be exported under absl:: (see Note).
# Also in IDE, target will appear in Abseil folder while non PUBLIC will be in Abseil/internal.
# TESTONLY: When added, this target will only be built if user passes -DABSL_RUN_TESTS=ON to CMake.
#
# Note:
# By default, absl_cc_library will always create a library named absl_internal_${NAME},
# which means other targets can only depend this library as absl_internal_${NAME}, not ${NAME}.
# and alias target absl::${NAME}.
# This is to reduce namespace pollution.
#
# absl_cc_library(
Expand All @@ -98,7 +99,7 @@ endfunction()
# )
#
# If PUBLIC is set, absl_cc_library will instead create a target named
# absl_${NAME} and an alias absl::${NAME}.
# absl_${NAME} and still an alias absl::${NAME}.
#
# absl_cc_library(
# NAME
Expand Down Expand Up @@ -146,7 +147,13 @@ function(absl_cc_library)
target_compile_definitions(${_NAME} PUBLIC ${ABSL_CC_LIB_DEFINES})

# Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER})
if(ABSL_CC_LIB_PUBLIC)
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER})
elseif(ABSL_CC_LIB_TESTONLY)
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}/test)
else()
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}/internal)
endif()
else()
# Generating header-only library
add_library(${_NAME} INTERFACE)
Expand All @@ -157,10 +164,7 @@ function(absl_cc_library)
)
target_compile_definitions(${_NAME} INTERFACE ${ABSL_CC_LIB_DEFINES})
endif()

if(ABSL_CC_LIB_PUBLIC)
add_library(absl::${ABSL_CC_LIB_NAME} ALIAS ${_NAME})
endif()
add_library(absl::${ABSL_CC_LIB_NAME} ALIAS ${_NAME})
endif()
endfunction()

Expand Down Expand Up @@ -231,7 +235,7 @@ function(absl_cc_test)
PRIVATE ${ABSL_CC_TEST_LINKOPTS}
)
# Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER})
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}/test)

add_test(NAME ${_NAME} COMMAND ${_NAME})
endfunction()
Expand Down
2 changes: 1 addition & 1 deletion CMake/DownloadGTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Download the latest googletest from Github master
configure_file(
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in
googletest-download/CMakeLists.txt
${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt
)

# Configure and build the downloaded googletest source
Expand Down
70 changes: 33 additions & 37 deletions absl/algorithm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,50 +14,46 @@
# limitations under the License.
#

list(APPEND ALGORITHM_PUBLIC_HEADERS
"algorithm.h"
"container.h"
)


#
## TESTS
#

# test algorithm_test
list(APPEND ALGORITHM_TEST_SRC
"algorithm_test.cc"
${ALGORITHM_PUBLIC_HEADERS}
${ALGORITHM_INTERNAL_HEADERS}
)

absl_header_library(
TARGET
absl_algorithm
EXPORT_NAME
absl_cc_library(
NAME
algorithm
HDRS
"algorithm.h"
PUBLIC
)

absl_test(
TARGET
absl_cc_test(
NAME
algorithm_test
SOURCES
${ALGORITHM_TEST_SRC}
PUBLIC_LIBRARIES
SRCS
"algorithm_test.cc"
DEPS
absl::algorithm
gmock_main
)

absl_cc_library(
NAME
algorithm_container
HDRS
"container.h"
DEPS
absl::algorithm
absl::core_headers
absl::meta
PUBLIC
)



# test container_test
set(CONTAINER_TEST_SRC "container_test.cc")

absl_test(
TARGET
absl_cc_test(
NAME
container_test
SOURCES
${CONTAINER_TEST_SRC}
PUBLIC_LIBRARIES
absl::algorithm
SRCS
"container_test.cc"
DEPS
absl::algorithm_container
absl::base
absl::core_headers
absl::memory
absl::span
gmock_main
)
Loading

0 comments on commit f6ae816

Please sign in to comment.