From fedf33b5ce81d309ddf5db652ff1a0dcbf3bb7c5 Mon Sep 17 00:00:00 2001
From: Rick Altherr <kc8apf@kc8apf.net>
Date: Tue, 14 Nov 2017 16:23:51 -0800
Subject: [PATCH] tools: build with CMake

Building with CMake makes it a lot easier to bring in other libraries
such as gflags and abseil.

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
---
 CMakeLists.txt       |  7 +++++++
 tools/CMakeLists.txt |  2 ++
 tools/Makefile       | 17 -----------------
 utils/environment.sh |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)
 create mode 100644 CMakeLists.txt
 create mode 100644 tools/CMakeLists.txt
 delete mode 100644 tools/Makefile

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..a8a93ac4
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.5.0)
+
+project(prjxray)
+
+set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Werror ${CMAKE_CXX_FLAGS}")
+
+add_subdirectory(tools)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 00000000..f462d46f
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(bitread bitread.cc)
+add_executable(segmatch segmatch.cc)
diff --git a/tools/Makefile b/tools/Makefile
deleted file mode 100644
index 2a7b7a7e..00000000
--- a/tools/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# CXXFLAGS = -Wall -Wextra -O0 -ggdb
-CXXFLAGS = -Wall -Wextra -O3
-
-all: bitread segmatch
-
-bitread: bitread.cc
-	clang $(CXXFLAGS) -std=c++11 -o $@ $< -lstdc++
-
-segmatch: segmatch.cc
-	clang $(CXXFLAGS) -std=c++11 -o $@ $< -lstdc++
-
-clean:
-	rm -f bitread segmatch
-
-.PHONY: all clean
-
diff --git a/utils/environment.sh b/utils/environment.sh
index 3b938e74..e6b3a0bc 100644
--- a/utils/environment.sh
+++ b/utils/environment.sh
@@ -8,7 +8,7 @@ XRAY_UTILS_DIR="$( cd -P "$( dirname "$XRAY_ENV_PATH" )" && pwd )"
 
 XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )"
 XRAY_DATABASE_DIR="${XRAY_DIR}/database"
-XRAY_TOOLS_DIR="${XRAY_DIR}/tools"
+XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools"
 
 XRAY_GENHEADER="${XRAY_UTILS_DIR}/genheader.sh"
 XRAY_BITREAD="${XRAY_TOOLS_DIR}/bitread"