X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F02-variables.cmake;h=dc1c313ee0cc1bdb13106257143bc6df0a9286ee;hb=a3c312ece0a77310a9d8ecde1dd0f1267646f4ff;hp=b4940f2d293283ec4926d185c0898aced4481372;hpb=6c0e9e48f57ed2f5cf5adf2f51f51cbf130abcf6;p=apps%2Fapp-templates.git diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake index b4940f2..dc1c313 100644 --- a/cmake/cmake.d/02-variables.cmake +++ b/cmake/cmake.d/02-variables.cmake @@ -67,6 +67,13 @@ execute_process(COMMAND git describe --abbrev=0 OUTPUT_STRIP_TRAILING_WHITESPACE ) +# Get the git commit hash to append to the version +execute_process(COMMAND git rev-parse --short HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE COMMIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE +) + # Detect unstaged or untracked changes execute_process(COMMAND git status --short WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} @@ -84,7 +91,9 @@ endif() # attributes then add the dirty flag if git repo not sync'ed project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES}) if(NOT ${DIRTY_FLAG}) -set(PROJECT_VERSION "${PROJECT_VERSION}-dirty") + set(PROJECT_VERSION "${PROJECT_VERSION}-${COMMIT_HASH}-dirty") +else() + set(PROJECT_VERSION "${PROJECT_VERSION}-${COMMIT_HASH}") endif() set(AFB_TOKEN "" CACHE PATH "Default AFB_TOKEN")