From 38cfdf99f4c7cdf3e81a4b32fb8ccaf522c84e73 Mon Sep 17 00:00:00 2001
From: Luminarys <kizunanohikari@gmail.com>
Date: Tue, 25 Aug 2015 22:04:57 -0500
Subject: [PATCH 1/2] Added in build version based on git hash

---
 CMakeLists.txt | 14 ++++++++++++++
 sway/main.c    |  6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1365a9aee..fe4247287 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,20 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin/")
 add_definitions("-Wall -Wextra -Wno-unused-parameter")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake)
 
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+  execute_process(
+    COMMAND git log -1 --format=%h
+    OUTPUT_VARIABLE GIT_COMMIT_HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+else(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+  set(GIT_COMMIT_HASH "Not Found")
+endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+
+SET(GIT_VERSION_FLAG "-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\"")
+
+add_definitions("${GIT_VERSION_FLAG}")
+
 find_package(XKBCommon REQUIRED)
 find_package(WLC REQUIRED)
 find_package(A2X REQUIRED)
diff --git a/sway/main.c b/sway/main.c
index afbdab33e..0880cb8c7 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -78,7 +78,11 @@ int main(int argc, char **argv) {
 			debug = 1;
 			break;
 		case 'v': // version
-			// todo
+#ifdef SWAY_GIT_VERSION
+			fprintf(stdout, "sway build %s\n", SWAY_GIT_VERSION);
+#else
+			fprintf(stdout, "version not detected\n");
+#endif
 			exit(0);
 			break;
 		case 'V': // verbose

From 429fc53e51bdbdbfc23894993f6ae170ff518fb6 Mon Sep 17 00:00:00 2001
From: Luminarys <kizunanohikari@gmail.com>
Date: Wed, 26 Aug 2015 09:14:32 -0500
Subject: [PATCH 2/2] Minor fixes

---
 CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe4247287..3e639e1fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake)
 
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
   execute_process(
-    COMMAND git log -1 --format=%h
+    COMMAND git describe --always
     OUTPUT_VARIABLE GIT_COMMIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-else(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-  set(GIT_COMMIT_HASH "Not Found")
 endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
 
 SET(GIT_VERSION_FLAG "-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\"")