From 3e0585e0b899ebbc1659b694092c82194f244ac2 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Fri, 3 May 2019 10:00:12 -0400 Subject: [PATCH] remove fatal error message from git revision when not in git --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d073e1290..c633b9c8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,9 +189,11 @@ add_compile_options(${OPTIMIZE_FLAGS} ${CRYPTO_FLAGS}) if(NOT GIT_VERSION) exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "rev-parse --short HEAD" OUTPUT_VARIABLE GIT_VERSION_UNSTRIP) string(STRIP "${GIT_VERSION_UNSTRIP}" GIT_VERSION) - add_definitions("-DGIT_REV=\"${GIT_VERSION}\"") endif(NOT GIT_VERSION) +string(REGEX REPLACE ^fatal.*$ nogit GIT_VERSION_REAL "${GIT_VERSION}") +add_definitions("-DGIT_REV=\"${GIT_VERSION_REAL}\"") + set(EXE lokinet) set(EXE_SRC daemon/main.cpp)