Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update abseil to the latest LTS. #1725

Merged
merged 3 commits into from
Jan 15, 2024
Merged

Update abseil to the latest LTS. #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f120b3
Simplify CMake FetchContent usage
bstaletic Jan 9, 2024
4d1accc
Update abseil
bstaletic Jan 9, 2024
aee891c
Merge branch 'master' into abseil-update
mergify[bot] Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,21 +237,18 @@ find_package( Python3 3.6 REQUIRED COMPONENTS Interpreter Development )
#############################################################################

set( CMAKE_POSITION_INDEPENDENT_CODE ON )
set( ABSL_PROPAGATE_CXX_STD ON )
if ( USE_SYSTEM_ABSEIL )
find_package( absl REQUIRED )
else()
include( FetchContent )
FetchContent_Declare(
absl
GIT_REPOSITORY https://github.com/abseil/abseil-cpp
GIT_TAG 3b4a16abad2c2ddc494371cc39a2946e36d35d11
GIT_TAG fb3621f4f897824c0dbe0615fa94543df6192f30
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/absl
)
FetchContent_GetProperties( absl )
if ( NOT absl_POPULATED )
FetchContent_Populate( absl )
endif()
add_subdirectory( absl )
FetchContent_MakeAvailable( absl )
endif()

add_subdirectory( ycm )
6 changes: 1 addition & 5 deletions cpp/ycm/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ else()
GIT_TAG 3b19d7222db7babfdc9b3949408b2294c3bbb540
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/benchmark
)
FetchContent_GetProperties( benchmark )
if ( NOT benchmark_POPULATED )
FetchContent_Populate( benchmark )
endif()
add_subdirectory( benchmark )
FetchContent_MakeAvailable( benchmark )
endif()

file( GLOB SOURCES *.h *.cpp )
Expand Down
6 changes: 1 addition & 5 deletions cpp/ycm/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,7 @@ else()
GIT_TAG f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmock
)
FetchContent_GetProperties( gmock )
if ( NOT benchmark_POPULATED )
FetchContent_Populate( gmock )
endif()
add_subdirectory( gmock )
FetchContent_MakeAvailable( gmock )
endif()

file( GLOB SOURCES *.h *.cpp )
Expand Down