Merge pull request #384 from stqism/master

Adds full -D support to toxics versioning, includes the commit number

2 files changed, 4 insertions, 1 deletions

diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt
index f30d8e9e..38f02dc6 100644
--- a/testing/toxic/CMakeLists.txt
+++ b/testing/toxic/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 2.6.0)
 project(toxic C)
 
+execute_process(COMMAND git rev-list HEAD --count OUTPUT_VARIABLE COMMIT)
+SET(GCC_COVERAGE_COMPILE_FLAGS '-DTOXICVER="0.1.1_r${COMMIT}"')
+add_definitions(${GCC_COVERAGE_COMPILE_FLAGS})
 set(exe_name toxic)
 
 add_executable(${exe_name}
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index d1519556..d4579571 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -22,7 +22,7 @@ extern int add_req(uint8_t *public_key); // XXX
 
 /* Holds status of chat windows */
 char WINDOW_STATUS[MAX_WINDOW_SLOTS];
-#define TOXICVER "0.1.0" //Will be moved to a -D flag later 
+//#define TOXICVER "0.1.0" //Will be moved to a -D flag later 
 
 static ToxWindow windows[MAX_WINDOW_SLOTS];
 static ToxWindow* prompt;