diff options
| author | Abseil Team <absl-team@google.com> | 2018-04-23T15·17-0700 |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2018-04-23T16·57-0400 |
| commit | af7882601aad93ada881486eeaabc562f1733961 (patch) | |
| tree | e9a52b01ef69c7654a97d66c8d60377c851ae817 /CMake | |
| parent | 94ce52d46c171683b1ee22d14277a6d3bdfd7c4c (diff) | |
- fd5f3d7077270ffc5ea74cdb9e18bbae3b9b46aa Fix typo optional -> variant by Abseil Team <absl-team@google.com>
- 9136c06dfa8dbfdde0a427ad3509e34763d607a6 Fix string_view_test and str_cat_test build under MSVC de... by Derek Mauro <dmauro@google.com> - a463820f9441888f4368aa87328599e3209f9b07 Removes constexpr optional<T>::operator->(). This was don... by Abseil Team <absl-team@google.com> - 3bf78a7f126daafff329f7815d507422f1ca378d Remove dependencies on external CCTZ project. by Shaindel Schwartz <shaindel@google.com> - a4ae574a11b1ddf6e88459af3d638cf79aea7ecd Internal change by Jon Cohen <cohenjon@google.com> GitOrigin-RevId: fd5f3d7077270ffc5ea74cdb9e18bbae3b9b46aa Change-Id: I6ab8ab99863716fe9b2745a12ef285f7a6da6d1e
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/AbseilHelpers.cmake | 2 | ||||
| -rw-r--r-- | CMake/README.md | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index b114b297cb27..0520fba3f001 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -34,7 +34,7 @@ function(absl_library) cmake_parse_arguments(ABSL_LIB "DISABLE_INSTALL" # keep that in case we want to support installation one day "TARGET;EXPORT_NAME" - "SOURCES;PUBLIC_LIBRARIES;PRIVATE_COMPILE_FLAGS;PUBLIC_INCLUDE_DIRS;PRIVATE_INCLUDE_DIRS" + "SOURCES;PUBLIC_LIBRARIES;PRIVATE_COMPILE_FLAGS" ${ARGN} ) diff --git a/CMake/README.md b/CMake/README.md index bfcf5807abd6..e99340cc6b6e 100644 --- a/CMake/README.md +++ b/CMake/README.md @@ -19,10 +19,8 @@ googletest framework ### Step-by-Step Instructions -1. If you haven't done so already, integrate the Abseil dependency -[CCTZ](https://github.com/google/cctz) into your CMake project. Consequently, the -target 'cctz' needs to be declared in your CMake project **before** including Abseil.<br> -Note: If you want to build the Abseil tests, you'll also need [Google Test](https://github.com/google/googletest). To disable Abseil tests, you have to pass +1. If you want to build the Abseil tests, integrate the Abseil dependency +[Google Test](https://github.com/google/googletest) into your CMake project. To disable Abseil tests, you have to pass `-DBUILD_TESTING=OFF` when configuring your project with CMake. 2. Download Abseil and copy it into a subdirectory in your CMake project or add @@ -31,8 +29,7 @@ CMake project. 3. You can then use the CMake command [`add_subdirectory()`](https://cmake.org/cmake/help/latest/command/add_subdirectory.html) -to include Abseil directly in your CMake project. In addition, it's possible to -customize the name of the `cctz` target with the `-DABSL_CCTZ_TARGET=*my_cctz*` option. +to include Abseil directly in your CMake project. 4. Add the **absl::** target you wish to use to the [`target_link_libraries()`](https://cmake.org/cmake/help/latest/command/target_link_libraries.html) |