Merge pull request #1725 from bstaletic/abseil-update

Update abseil to the latest LTS.
ycm-core · Jan 15, 2024 · 9004fdf · 9004fdf
2 parents eeaf205 + aee891c
commit 9004fdf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -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 )
diff --git a/cpp/ycm/benchmarks/CMakeLists.txt b/cpp/ycm/benchmarks/CMakeLists.txt
@@ -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 )

diff --git a/cpp/ycm/tests/CMakeLists.txt b/cpp/ycm/tests/CMakeLists.txt
@@ -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 )