sway

commit c4257055ebb74987b62833c0529ecfb9f9a1c47c
parent 93482312f9ce89075ea9d5e314b5217622894e92
Author: Drew DeVault <sir@cmpwn.com>
Date:   Wed, 26 Aug 2015 10:18:06 -0400

Merge pull request #135 from Luminarys/master

Added in build version based on git hash
Diffstat:
M
CMakeLists.txt
 | 
12
++++++++++++
M
sway/main.c
 | 
6
+++++-

2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,18 @@ 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 describe --always
+    OUTPUT_VARIABLE GIT_COMMIT_HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+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
@@ -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