From 9c47ceeef79caa02c5ee810659d8f784676b3f71 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 29 Jul 2018 14:08:27 +0200 Subject: Update build instructions --- vendor.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'vendor.cmake') 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() -- cgit v1.2.1