diff options
author | Luminarys <kizunanohikari@gmail.com> | 2015-08-26 09:14:32 -0500 |
---|---|---|
committer | Luminarys <kizunanohikari@gmail.com> | 2015-08-26 09:14:32 -0500 |
commit | 429fc53e51bdbdbfc23894993f6ae170ff518fb6 (patch) | |
tree | d065f1d164dfa336487eeb26a9b42002fb5a907f /CMakeLists.txt | |
parent | Added in build version based on git hash (diff) | |
download | sway-429fc53e51bdbdbfc23894993f6ae170ff518fb6.tar.gz sway-429fc53e51bdbdbfc23894993f6ae170ff518fb6.tar.zst sway-429fc53e51bdbdbfc23894993f6ae170ff518fb6.zip |
Minor fixes
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe424728..3e639e1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -7,12 +7,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake) | |||
7 | 7 | ||
8 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") | 8 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") |
9 | execute_process( | 9 | execute_process( |
10 | COMMAND git log -1 --format=%h | 10 | COMMAND git describe --always |
11 | OUTPUT_VARIABLE GIT_COMMIT_HASH | 11 | OUTPUT_VARIABLE GIT_COMMIT_HASH |
12 | OUTPUT_STRIP_TRAILING_WHITESPACE | 12 | OUTPUT_STRIP_TRAILING_WHITESPACE |
13 | ) | 13 | ) |
14 | else(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") | ||
15 | set(GIT_COMMIT_HASH "Not Found") | ||
16 | endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") | 14 | endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") |
17 | 15 | ||
18 | SET(GIT_VERSION_FLAG "-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\"") | 16 | SET(GIT_VERSION_FLAG "-DSWAY_GIT_VERSION=\"${GIT_COMMIT_HASH}\"") |