diff options
| author |  Abseil Team <absl-team@google.com> | 2019-02-26 08:22:49 -0800 |
|---|---|---|
| committer |  Jon Cohen <cohenjon@google.com> | 2019-02-26 17:48:41 -0500 |
| commit | b312c3cb53a0aad75a85ac2bf57c4a614fbd48d4 (patch) | |
| tree | 1ed95d13377d237e44a2223a523747075c409f79 | |
| parent | 308ce31528a7edfa39f5f6d36142278a0ae1bf45 (diff) | |
Export of internal Abseil changes.
--
4501f16edb0939be6165df74c70a421d3a959aa5 by Jon Cohen <cohenjon@google.com>:
Remove use of list(FILTER as it's only available in cmake 3.6. We currently have to support cmake 3.5 at least because of Ubuntu 14.04. Also make sure to exclude .inc files when checking if the library is header only.
Fixes #263
PiperOrigin-RevId: 235725207
--
68ceb6a674a6cbb74472c64915e9e76d2de2fb8d by Abseil Team <absl-team@google.com>:
Fix comment in FixedArrayTest.SmallObjects.
PiperOrigin-RevId: 235671337
GitOrigin-RevId: 4501f16edb0939be6165df74c70a421d3a959aa5
Change-Id: I7c2759ad9d1d086cc7c213e7964279366113fccb
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 9 | ||||
| -rw-r--r-- | absl/container/fixed_array_test.cc | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index 350282f7..49ef7dcc 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -90,8 +90,15 @@ function(absl_cc_library) endif() # Check if this is a header-only library + # Note that as of February 2019, many popular OS's (for example, Ubuntu + # 16.04 LTS) only come with cmake 3.5 by default. For this reason, we can't + # use list(FILTER...) set(ABSL_CC_SRCS "${ABSL_CC_LIB_SRCS}") - list(FILTER ABSL_CC_SRCS EXCLUDE REGEX ".*\\.h") + foreach(src_file IN LISTS ABSL_CC_SRCS) + if(${src_file} MATCHES ".*\\.(h|inc)") + list(REMOVE_ITEM ABSL_CC_SRCS "${src_file}") + endif() + endforeach() if ("${ABSL_CC_SRCS}" STREQUAL "") set(ABSL_CC_LIB_IS_INTERFACE 1) else() diff --git a/absl/container/fixed_array_test.cc b/absl/container/fixed_array_test.cc index 1679ba4f..6198e4bb 100644 --- a/absl/container/fixed_array_test.cc +++ b/absl/container/fixed_array_test.cc @@ -150,7 +150,7 @@ TEST(FixedArrayTest, SmallObjects) { } { - // Arrays of > default size should be on the stack + // Arrays of > default size should be on the heap absl::FixedArray<int, 100> array(101); EXPECT_FALSE(IsOnStack(array)); } |