From 63a5d91731295c8f2460d1af1d321ead0e7da7c0 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 20 Oct 2020 08:19:13 +0200 Subject: [BUILD] do not stop Release build if repository is dirty but warn --- cmake/GenerateVersion.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'cmake') diff --git a/cmake/GenerateVersion.cmake b/cmake/GenerateVersion.cmake index 152ab11..4dfdaa8 100644 --- a/cmake/GenerateVersion.cmake +++ b/cmake/GenerateVersion.cmake @@ -16,11 +16,16 @@ execute_process(COMMAND git status --porcelain OUTPUT_VARIABLE DNBD3_GIT_STATUS OUTPUT_STRIP_TRAILING_WHITESPACE) -if(VERSION_BUILD_TYPE MATCHES "Release" AND NOT DNBD3_GIT_STATUS STREQUAL "") - message(FATAL_ERROR "This dnbd3 Git repository is dirty! Please commit or revert all changes for the ${VERSION_BUILD_TYPE} build!") -else(VERSION_BUILD_TYPE MATCHES "Release" AND NOT DNBD3_GIT_STATUS STREQUAL "") +# check if Git repository is dirty +if(NOT DNBD3_GIT_STATUS STREQUAL "") + # the Git repository is dirty, thus extend the version information set(DNBD3_BUILD_VERSION "${DNBD3_BUILD_VERSION}-modified") -endif(VERSION_BUILD_TYPE MATCHES "Release" AND NOT DNBD3_GIT_STATUS STREQUAL "") + + # print a message in Release build configuration to warn about the dirty repository + if(VERSION_BUILD_TYPE MATCHES "Release") + message(WARNING "This dnbd3 Git repository is dirty! Please commit or revert all changes for a ${VERSION_BUILD_TYPE} build!") + endif(VERSION_BUILD_TYPE MATCHES "Release") +endif(NOT DNBD3_GIT_STATUS STREQUAL "") # set current build type of the project set(DNBD3_BUILD_TYPE ${VERSION_BUILD_TYPE}) -- cgit v1.2.3-55-g7522