From ca830f267a2fa1ae8dd7698e94f65dfa890b5054 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 22 May 2017 14:30:12 +0100 Subject: [PATCH] Use 8 characters for SYNERGY_REVISION --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 964a3876..7cc775a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ endif() if (NOT DEFINED SYNERGY_REVISION) if (DEFINED ENV{GIT_COMMIT}) - string (SUBSTRING $ENV{GIT_COMMIT} 0 7 SYNERGY_REVISION) + string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION) elseif (SYNERGY_VERSION_STAGE STREQUAL "git") execute_process ( COMMAND git rev-parse --short HEAD @@ -86,9 +86,9 @@ if (NOT DEFINED SYNERGY_REVISION) endif() endif() -#if (NOT "${SYNERGY_REVISION}" MATCHES "[a-f0-9]{8}") -# message (FATAL_ERROR "SYNERGY_VERSION='${SYNERGY_REVISION}' is an invalid git shorthash") -#endif() +if (NOT SYNERGY_REVISION MATCHES "[a-f0-9]{8}") + message (FATAL_ERROR "SYNERGY_VERSION='${SYNERGY_REVISION}' is invalid") +endif() string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) if (DEFINED ENV{BUILDS_TODAY})