diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2016-07-12 09:49:45 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-12 09:49:45 -0400 |
| commit | dff1e7f91bd270b0804456f08b027e63a8666bfc (patch) | |
| tree | dc9d63489bf9cfedc8d17db273142abdc532790c | |
| parent | Merge pull request #747 from deklov/clang-format-01 (diff) | |
| parent | Enable using non-annotated tags in git-describe (diff) | |
| download | sway-dff1e7f91bd270b0804456f08b027e63a8666bfc.tar.gz sway-dff1e7f91bd270b0804456f08b027e63a8666bfc.tar.zst sway-dff1e7f91bd270b0804456f08b027e63a8666bfc.zip | |
Merge pull request #749 from Hummer12007/patch-2
Enable using non-annotated tags in git-describe
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 813bec4d..83989ecd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -20,7 +20,7 @@ list(INSERT CMAKE_MODULE_PATH 0 | |||
| 20 | ) | 20 | ) |
| 21 | if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) | 21 | if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) |
| 22 | execute_process( | 22 | execute_process( |
| 23 | COMMAND git describe --always | 23 | COMMAND git describe --always --tags |
| 24 | OUTPUT_VARIABLE GIT_COMMIT_HASH | 24 | OUTPUT_VARIABLE GIT_COMMIT_HASH |
| 25 | OUTPUT_STRIP_TRAILING_WHITESPACE | 25 | OUTPUT_STRIP_TRAILING_WHITESPACE |
| 26 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | 26 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |