--- a/CMakeLists.txt 2020-05-24 06:43:55.000000000 +0200 +++ b/CMakeLists.txt 2026-10-19 17:59:12.945061182 +0200 @@ -89,11 +89,11 @@ endif(UNIX) include_directories(.) include_directories(src) -include_directories(third_party/abseil-cpp) +find_package(absl REQUIRED) include_directories("${CMAKE_CURRENT_BINARY_DIR}/src") # Baseline build flags. -set(CMAKE_CXX_FLAGS "-std=c++11 -W -Wall -Wno-sign-compare") +set(CMAKE_CXX_FLAGS "-std=c++17 -W -Wall -Wno-sign-compare") set(CMAKE_CXX_FLAGS_DEBUG "-g1") set(CMAKE_CXX_FLAGS_RELEASE "-O2") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g1") @@ -149,7 +149,7 @@ endif(${PROTOC_FOUND}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/bloaty_package.bloaty DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -add_library(libbloaty +add_library(libbloaty STATIC src/bloaty.cc src/demangle.cc src/disassemble.cc @@ -159,28 +159,12 @@ add_library(libbloaty src/macho.cc src/range_map.cc src/webassembly.cc - # Until Abseil has a proper CMake build system - third_party/abseil-cpp/absl/base/internal/raw_logging.cc # Grrrr... - third_party/abseil-cpp/absl/base/internal/throw_delegate.cc - third_party/abseil-cpp/absl/numeric/int128.cc - third_party/abseil-cpp/absl/strings/ascii.cc - third_party/abseil-cpp/absl/strings/charconv.cc - third_party/abseil-cpp/absl/strings/escaping.cc - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc - third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc - third_party/abseil-cpp/absl/strings/internal/memutil.cc - third_party/abseil-cpp/absl/strings/internal/utf8.cc - third_party/abseil-cpp/absl/strings/match.cc - third_party/abseil-cpp/absl/strings/numbers.cc - third_party/abseil-cpp/absl/strings/str_cat.cc - third_party/abseil-cpp/absl/strings/string_view.cc - third_party/abseil-cpp/absl/strings/str_split.cc - third_party/abseil-cpp/absl/strings/substitute.cc - third_party/abseil-cpp/absl/types/bad_optional_access.cc # One source file, no special build system needed. third_party/demumble/third_party/libcxxabi/cxa_demangle.cpp ) +target_link_libraries(libbloaty absl::strings absl::int128 absl::optional) + if(UNIX) set(LIBBLOATY_LIBS libbloaty) if(${PROTOBUF_FOUND})