aboutsummaryrefslogtreecommitdiff
path: root/vendor.cmake
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-07-29 14:08:27 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2018-07-29 14:08:27 +0200
commit9c47ceeef79caa02c5ee810659d8f784676b3f71 (patch)
tree97282bbdc20b844cd7ca63cdb82af67ba1dc5098 /vendor.cmake
parentUrlRequestInterceptor: add filter rules (diff)
downloadsmolbote-9c47ceeef79caa02c5ee810659d8f784676b3f71.tar.xz
Update build instructions
Diffstat (limited to 'vendor.cmake')
-rw-r--r--vendor.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor.cmake b/vendor.cmake
index 296eb16..0e59149 100644
--- a/vendor.cmake
+++ b/vendor.cmake
@@ -13,8 +13,10 @@ set(poi_NAME poi)
# version information
if (EXISTS "${PROJECT_SOURCE_DIR}/.git")
- execute_process(COMMAND git describe --tags --abbrev=0 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE VerTag OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE VerDescribe OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND git rev-list --count HEAD WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE VerRevision OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND git rev-parse --short HEAD WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE VerShortId OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(VerTag "r${VerRevision}")
+ set(VerDescribe "r${VerRevision}-${VerShortId}")
execute_process(COMMAND git rev-parse HEAD WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE VerCommit OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND git rev-parse --abbrev-ref HEAD WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE VerBranch OUTPUT_STRIP_TRAILING_WHITESPACE)
else()