Skip to content

A
abseil-cpp
Commit a3322e3b by Adrien Devresse
Options

Continue CMake support improvement 

- Update documentation
- Remove type target
- Remove typos
- simplify target
- improve 1-1 matchign with Bazel targets
parent 200b5a7c
Showing with 174 additions and 51 deletions
CMake/AbseilHelpers.cmake
...@@ -16,10 +16,9 @@ ...@@ -16,10 +16,9 @@
include(CMakeParseArguments) include(CMakeParseArguments)
set(_ABSL_HELPERS_PATH "${CMAKE_CURRENT_LIST_DIR}")
# #
# create a static library absl_based on the following variable # create a library in the absl namespace
# #
# parameters # parameters
# SOURCES : sources files for the library # SOURCES : sources files for the library
......
CMake/README.md
...@@ -4,37 +4,64 @@ ...@@ -4,37 +4,64 @@
### Recommended usage : incorporate Abseil into an CMake project ### Recommended usage : incorporate Abseil into an CMake project
We recommended to build and use abseil in the same way than googletest For API / ABI compatibility reasons, it is recommended to build
( https://github.com/google/googletest/blob/master/googletest/README.md ) and use abseil in a subdirectory of your project or as an embedded
dependency
* Download abseil and copy it in a sub-directory in your project. This is similar to the recommended usage of the googletest framework
( https://github.com/google/googletest/blob/master/googletest/README.md )
* Or add abseil as a git-submodule in your project Build and use step-by-step
You can then use the cmake `add_subdirectory()` command to include
abseil directly and use the abseil targets in your project.
Abseil requires CCTZ and the googletest framework. Consequently, 1- Download abseil and copy it in a sub-directory in your project.
or add abseil as a git-submodule in your project
2- If not done yet, download and copy in your project the two dependencies of
abseil `cctz` and `googletest`
* cctz https://github.com/google/cctz
* googletest https://github.com/google/googletest
3- You can then use the cmake command `add_subdirectory()` to include
abseil directly and use the abseil targets in your project.
Note: Abseil requires CCTZ and the googletest framework. Consequently,
the targets `gtest`, `gtest_main`, `gmock` and `cctz` need the targets `gtest`, `gtest_main`, `gmock` and `cctz` need
to be declared in your project before including abseil with `add_subdirectory`. to be declared in your project before including abseil with `add_subdirectory`.
You can find instructions on how to get and build these projects at these
URL :
* cctz https://github.com/google/cctz 4- Add the absl:: target you wish to use to the `target_link_libraries()`
* googletest https://github.com/google/googletest section of your executable or of your library
Here is a short CMakeLists.txt example of a possible project file
Here is a short CMakeLists.txt example of a possible project file using abseil
using abseil
project(my_project)
project(my_project)
add_subdirectory(googletest)
add_subdirectory(googletest) add_subdirectory(cctz)
add_subdirectory(cctz) add_subdirectory(abseil-cpp)
add_subdirectory(abseil-cpp)
add_executable(my_exe source.cpp)
add_executable(my_exe source.cpp) target_link_libraries(my_exe absl::base absl::synchronization absl::strings)
target_link_libraries(my_exe base synchronization strings)
You will find here a non exhaustive list of absl public targets
absl::base
absl::algorithm
absl::container
absl::debugging
absl::memory
absl::meta
absl::numeric
absl::strings
absl::synchronization
absl::time
absl::utility
......
absl/base/CMakeLists.txt
...@@ -65,10 +65,8 @@ list(APPEND BASE_SRC ...@@ -65,10 +65,8 @@ list(APPEND BASE_SRC
"internal/sysinfo.cc" "internal/sysinfo.cc"
"internal/thread_identity.cc" "internal/thread_identity.cc"
"internal/unscaledcycleclock.cc" "internal/unscaledcycleclock.cc"
"internal/spinlock_wait.cc"
"internal/low_level_alloc.cc" "internal/low_level_alloc.cc"
"internal/malloc_hook.cc" "internal/malloc_hook.cc"
"dynamic_annotations.cc"
${BASE_PUBLIC_HEADERS} ${BASE_PUBLIC_HEADERS}
${BASE_INTERNAL_HEADERS} ${BASE_INTERNAL_HEADERS}
) )
...@@ -78,6 +76,9 @@ absl_library( ...@@ -78,6 +76,9 @@ absl_library(
absl_base absl_base
SOURCES SOURCES
${BASE_SRC} ${BASE_SRC}
PUBLIC_LIBRARIES
absl_dynamic_annotations
absl_spinlock_wait
EXPORT_NAME EXPORT_NAME
base base
) )
...@@ -93,6 +94,8 @@ absl_library( ...@@ -93,6 +94,8 @@ absl_library(
${MALLOC_EXTENSION_SRC} ${MALLOC_EXTENSION_SRC}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${MALLOC_EXTENSION_PUBLIC_LIBRARIES} ${MALLOC_EXTENSION_PUBLIC_LIBRARIES}
EXPORT_NAME
malloc_extension
) )
# throw delegate library # throw delegate library
...@@ -107,9 +110,51 @@ absl_library( ...@@ -107,9 +110,51 @@ absl_library(
${THROW_DELEGATE_PUBLIC_LIBRARIES} ${THROW_DELEGATE_PUBLIC_LIBRARIES}
PRIVATE_COMPILE_FLAGS PRIVATE_COMPILE_FLAGS
${ABSL_EXCEPTIONS_FLAG} ${ABSL_EXCEPTIONS_FLAG}
EXPORT_NAME
throw_delegate
) )
# dynamic_annotations library
set(DYNAMIC_ANNOTATIONS_SRC "dynamic_annotations.cc")
absl_library(
TARGET
absl_dynamic_annotations
SOURCES
${DYNAMIC_ANNOTATIONS_SRC}
)
# spinlock_wait library
set(SPINLOCK_WAIT_SRC "internal/spinlock_wait.cc")
absl_library(
TARGET
absl_spinlock_wait
SOURCES
${SPINLOCK_WAIT_SRC}
)
# malloc_internal library
list(APPEND MALLOC_INTERNAL_SRC
"internal/low_level_alloc.cc"
"internal/malloc_hook.cc"
"internal/malloc_hook_mmap_linux.inc"
)
absl_library(
TARGET
absl_malloc_internal
SOURCES
${MALLOC_INTERNAL_SRC}
PUBLIC_LIBRARIES
absl_dynamic_annotations
)
# #
## TESTS ## TESTS
# #
......
absl/debugging/CMakeLists.txt
...@@ -42,17 +42,52 @@ absl_library( ...@@ -42,17 +42,52 @@ absl_library(
absl_stacktrace absl_stacktrace
SOURCES SOURCES
${STACKTRACE_SRC} ${STACKTRACE_SRC}
PUBLIC_LIBRARIES
${STACKTRACE_PUBLIC_LIBRARIES}
EXPORT_NAME EXPORT_NAME
stacktrace stacktrace
) )
list(APPEND LEAK_CHECK_SRC
"leak_check.cc"
)
# leak_check library
absl_library(
TARGET
absl_leak_check
SOURCES
${LEAK_CHECK_SRC}
PUBLIC_LIBRARIES
absl_base
EXPORT_NAME
leak_check
)
# component target
absl_header_library( absl_header_library(
TARGET TARGET
absl_debugging absl_debugging
PUBLIC_LIBRARIES
absl_stacktrace absl_leak_check
EXPORT_NAME EXPORT_NAME
debugging debugging
) )
#
## TESTS
#
# test leak_check_test
list(APPEND LEAK_CHECK_TEST_SRC "leak_check_test.cc")
absl_test(
TARGET
leak_check_test
SOURCES
${LEAK_CHECK_TEST_SRC}
PUBLIC_LIBRARIES
absl_leak_check
)
absl/strings/CMakeLists.txt
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
list(APPEND STRINGS_PUBLIC_HEADERS list(APPEND STRINGS_PUBLIC_HEADERS
"ascii_ctype.h"
"ascii.h" "ascii.h"
"escaping.h" "escaping.h"
"match.h" "match.h"
......
absl/types/CMakeLists.txt
...@@ -23,12 +23,32 @@ list(APPEND TYPES_PUBLIC_HEADERS ...@@ -23,12 +23,32 @@ list(APPEND TYPES_PUBLIC_HEADERS
) )
# any library
absl_header_library(
TARGET
absl_any
PUBLIC_LIBRARIES
absl::utility
EXPORT_NAME
any
)
# span library
absl_header_library(
TARGET
absl_span
PUBLIC_LIBRARIES
absl::utility
EXPORT_NAME
span
)
# bad_any_cast library
list(APPEND BAD_ANY_CAST_SRC list(APPEND BAD_ANY_CAST_SRC
"bad_any_cast.cc" "bad_any_cast.cc"
${TYPES_PUBLIC_HEADERS} ${TYPES_PUBLIC_HEADERS}
) )
set(BAD_ANY_CAST_PUBLIC_LIBRARIES absl::base)
absl_library( absl_library(
TARGET TARGET
...@@ -36,13 +56,16 @@ absl_library( ...@@ -36,13 +56,16 @@ absl_library(
SOURCES SOURCES
${BAD_ANY_CAST_SRC} ${BAD_ANY_CAST_SRC}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${BAD_ANY_CAST_PUBLIC_LIBRARIES} absl::base absl::any
EXPORT_NAME
bad_any_cast
) )
# optional library
set(OPTIONAL_SRC "optional.cc") list(APPEND OPTIONAL_SRC
set(OPTIONAL_PUBLIC_LIBRARIES absl::base) "optional.cc"
)
absl_library( absl_library(
TARGET TARGET
...@@ -50,7 +73,9 @@ absl_library( ...@@ -50,7 +73,9 @@ absl_library(
SOURCES SOURCES
${OPTIONAL_SRC} ${OPTIONAL_SRC}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${OPTIONAL_PUBLIC_LIBRARIES} absl::base
EXPORT_NAME
optional
) )
...@@ -64,19 +89,12 @@ absl_library( ...@@ -64,19 +89,12 @@ absl_library(
${BAD_OPTIONAL_ACCESS_SRC} ${BAD_OPTIONAL_ACCESS_SRC}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${BAD_OPTIONAL_ACCESS_PUBLIC_LIBRARIES} ${BAD_OPTIONAL_ACCESS_PUBLIC_LIBRARIES}
EXPORT_NAME
bad_optional_access
) )
absl_header_library(
TARGET
absl_types
PUBLIC_LIBRARIES
absl_optional absl_bad_any_cast absl_bad_optional_access
EXPORT_NAME
types
)
# #
## TESTS ## TESTS
# #
...@@ -84,7 +102,7 @@ absl_header_library( ...@@ -84,7 +102,7 @@ absl_header_library(
# test any_test # test any_test
set(ANY_TEST_SRC "any_test.cc") set(ANY_TEST_SRC "any_test.cc")
set(ANY_TEST_PUBLIC_LIBRARIES absl::base absl_throw_delegate absl_bad_any_cast test_instance_tracker_lib) set(ANY_TEST_PUBLIC_LIBRARIES absl::base absl::throw_delegate absl::any absl::bad_any_cast test_instance_tracker_lib)
absl_test( absl_test(
TARGET TARGET
...@@ -111,7 +129,7 @@ absl_test( ...@@ -111,7 +129,7 @@ absl_test(
# test span_test # test span_test
set(SPAN_TEST_SRC "span_test.cc") set(SPAN_TEST_SRC "span_test.cc")
set(SPAN_TEST_PUBLIC_LIBRARIES absl::base absl::strings absl_throw_delegate absl_bad_any_cast test_instance_tracker_lib) set(SPAN_TEST_PUBLIC_LIBRARIES absl::base absl::strings absl::throw_delegate absl::span test_instance_tracker_lib)
absl_test( absl_test(
TARGET TARGET
...@@ -139,7 +157,7 @@ absl_test( ...@@ -139,7 +157,7 @@ absl_test(
# test optional_test # test optional_test
set(OPTIONAL_TEST_SRC "optional_test.cc") set(OPTIONAL_TEST_SRC "optional_test.cc")
set(OPTIONAL_TEST_PUBLIC_LIBRARIES absl::base absl_throw_delegate absl_optional bad_optional_access) set(OPTIONAL_TEST_PUBLIC_LIBRARIES absl::base absl::throw_delegate absl::optional absl_bad_optional_access)
absl_test( absl_test(
TARGET TARGET
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment