diff options
| author | Drew DeVault <[email protected]> | 2015-08-26 10:18:06 -0400 |
|---|---|---|
| committer | Drew DeVault <[email protected]> | 2015-08-26 10:18:06 -0400 |
| commit | c4257055ebb74987b62833c0529ecfb9f9a1c47c (patch) | |
| tree | 3bb46275a4a68674c700f8134e99e5b78c9d717f | |
| parent | 93482312f9ce89075ea9d5e314b5217622894e92 (diff) | |
| parent | 429fc53e51bdbdbfc23894993f6ae170ff518fb6 (diff) | |
Merge pull request #135 from Luminarys/master
Added in build version based on git hash
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | sway/main.c | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e400cd2..bbf61299 100644 --- 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 index afbdab33..0880cb8c 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 |