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

Jump to bottom

Updated ABSL and finally used ABSL's CMake build system. #207

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Updated ABSL and finally used ABSL's CMake build system. #207

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
73e3559
Updated ABSL and finally used ABSL's CMake build system.
haberman Jun 28, 2020
18e4749
Updated ABSL.
haberman Jun 28, 2020
8a48ec6
Fix for CMake build of tests.
haberman Jun 28, 2020
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
22 changes: 4 additions & 18 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,24 +159,6 @@ add_library(libbloaty STATIC
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
)
Expand All @@ -202,6 +184,10 @@ else(UNIX)
set(LIBBLOATY_LIBS libbloaty libprotoc re2 capstone-static)
endif(UNIX)

add_subdirectory(third_party/abseil-cpp)
set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} absl::strings)
set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} absl::optional)

if(UNIX)
if(${RE2_FOUND})
link_directories(${RE2_LIBRARY_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion third_party/abseil-cpp
Open in desktop
Submodule abseil-cpp updated 640 files