From 9c6bd668598783dc6cad8289aa1ad3946cb5b474 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sun, 21 Feb 2016 13:43:53 +0800 Subject: [PATCH] LWS_BUILD_HASH improve Signed-off-by: Andy Green --- CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52f27ff..34fe1ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,23 @@ find_package(Git) if(GIT_EXECUTABLE) execute_process( WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMAND "${GIT_EXECUTABLE}" log -n 1 --pretty=%h + COMMAND "${GIT_EXECUTABLE}" describe OUTPUT_VARIABLE GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ) - - set(LWS_BUILD_HASH ${GIT_HASH}) + execute_process( + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + COMMAND "whoami" + OUTPUT_VARIABLE GIT_USER + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + execute_process( + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + COMMAND "hostname" + OUTPUT_VARIABLE GIT_HOST + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + set(LWS_BUILD_HASH ${GIT_USER}@${GIT_HOST}-${GIT_HASH}) message("Git commit hash: ${LWS_BUILD_HASH}") endif() -- 2.7.4