commit 8cb4f772ac9e0780929896c336860c50b270d90c
author Joshua Haberman <jhaberman@gmail.com> Tue Aug 07 13:38:59 2018 -0700
committer Joshua Haberman <jhaberman@gmail.com> Tue Aug 07 13:38:59 2018 -0700
tree 5e63108eb688b80221fef279bf65c9fb884029d9
parent 8920e3dd5dba526d1aa071fd5138cc17d42fcac3

Updates to source to compile with latest submodules.

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index baf4ebc..7bf6abb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
-cmake_minimum_required (VERSION 2.6)
-project (Bloaty)
+cmake_minimum_required (VERSION 3.0)
+cmake_policy(SET CMP0048 NEW)
+project (Bloaty VERSION 1.0)
 
 # Options we define for users.
 option(BLOATY_ENABLE_ASAN "Enable address sanitizer." OFF)
@@ -94,6 +95,9 @@
     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/strings/ascii.cc
+    third_party/abseil-cpp/absl/strings/charconv.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/escaping.cc
     third_party/abseil-cpp/absl/strings/internal/memutil.cc
     third_party/abseil-cpp/absl/strings/internal/utf8.cc

src/bloaty.cc

diff --git a/src/bloaty.cc b/src/bloaty.cc
index 0f09756..2e44166 100644
--- a/src/bloaty.cc
+++ b/src/bloaty.cc
@@ -1884,6 +1884,9 @@
     } else if (args.TryParseFlag("--help")) {
       fputs(usage, stderr);
       return false;
+    } else if (args.TryParseFlag("--version")) {
+      printf("Bloaty McBloatface 1.0\n");
+      exit(0);
     } else if (absl::StartsWith(args.Arg(), "-")) {
       if (skip_unknown) {
         args.ConsumeAndSaveArg();

src/bloaty.h

diff --git a/src/bloaty.h b/src/bloaty.h
index 8e1cbce..58572ee 100644
--- a/src/bloaty.h
+++ b/src/bloaty.h
@@ -32,7 +32,7 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-#include "capstone.h"
+#include "capstone/capstone.h"
 #include "re2/re2.h"
 
 #include "bloaty.pb.h"

src/disassemble.cc

diff --git a/src/disassemble.cc b/src/disassemble.cc
index b1bb710..875b082 100644
--- a/src/disassemble.cc
+++ b/src/disassemble.cc
@@ -20,7 +20,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
-#include "capstone.h"
+#include "capstone/capstone.h"
 
 static void Throw(const char *str, int line) {
   throw bloaty::Error(str, __FILE__, line);