Skip to content

Commit

Permalink
Update Protobuf, do not link obsolete Abseil targets
Browse files Browse the repository at this point in the history
Drive-by: Enable new policy for finding Boost
PiperOrigin-RevId: 730394424
Change-Id: I7be1cfee3d40d994557b59ea5b3ff53ab375f964
  • Loading branch information
cblichmann authored and copybara-github committed Feb 24, 2025
1 parent 23619ba commit b77ade3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ cmake_policy(VERSION 3.20)
foreach(_binexport_policy IN ITEMS
CMP0135 # Set download timestamp to current time
CMP0144 # Use upper-case <PACKAGENAME>_ROOT variables
CMP0167 # Drop the FindBoost module
)
if(POLICY ${_binexport_policy})
cmake_policy(SET ${_binexport_policy} NEW)
Expand Down Expand Up @@ -142,7 +143,6 @@ add_library(binexport_shared STATIC
util/types.h
)
target_link_libraries(binexport_shared PUBLIC
absl::bad_optional_access
absl::check
absl::flat_hash_map
absl::flat_hash_set
Expand Down Expand Up @@ -262,7 +262,6 @@ add_library(binexport_core
x86_nop.h
)
target_link_libraries(binexport_core PUBLIC
absl::bad_optional_access
absl::btree
absl::check
absl::flat_hash_map
Expand Down
8 changes: 3 additions & 5 deletions cmake/BinExportDeps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ endif()

# Abseil
FetchContent_Declare(absl
URL https://github.com/abseil/abseil-cpp/archive/7e5c339b1aa790ae03cc614a8d7626d5b4831891.zip # 2024-07-25 (RC2)
URL_HASH SHA256=2ad33d08a720fa3a67ec12bd8cf9846da7ed53045163d69047856cc671a0cbe5
URL https://github.com/abseil/abseil-cpp/archive/9f3d4d7c70db545ce6c69d92796f5ed811510b78.zip # 2025-02-20
URL_HASH SHA256=77dd525ec246a5b5100ea0db138caca0e9857f5f1dfa8761f972ad834e24d679
)
set(ABSL_CXX_STANDARD ${CMAKE_CXX_STANDARD} CACHE STRING "" FORCE)
set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE)
Expand All @@ -75,9 +75,7 @@ endif()
# Protocol Buffers
FetchContent_Declare(protobuf
GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git
GIT_TAG v27.2 # 2024-05-25 (must be a branch for GIT_SHALLOW to work)
GIT_SUBMODULES third_party/jsoncpp
GIT_SHALLOW TRUE
GIT_TAG e390402c5e372de349af88ae0197c67529cf9360 # 2025-02-22
)
set(protobuf_ABSL_PROVIDER "package" CACHE STRING "" FORCE)
set(protobuf_BUILD_TESTS OFF CACHE BOOL "" FORCE)
Expand Down
1 change: 0 additions & 1 deletion ida/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ add_ida_plugin(${binexport_ida_plugin_name}
ppc.h
)
ida_target_link_libraries(${binexport_ida_plugin_name}
absl::bad_optional_access
absl::flat_hash_map
absl::flat_hash_set
absl::hash
Expand Down

0 comments on commit b77ade3

Please sign in to comment.