From ec9d5feba1e3d72ca890a5aa22ceee8917c0a4d5 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Tue, 30 Jan 2018 19:20:51 +0100 Subject: [PATCH] Allow user to override BUILDING_FROM_VCS --- CMakeLists.txt | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 283424ee2a..31a5928a4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,16 +134,17 @@ EXECUTE_PROCESS( OUTPUT_STRIP_TRAILING_WHITESPACE ) -SET(BUILDING_FROM_VCS "NO") -IF (GNC_VCS_INFO_RESULT EQUAL 0) - SET(BUILDING_FROM_VCS "YES") - # IF building from VCS, we need git - find_package(Git) - IF (NOT GIT_FOUND) - MESSAGE(SEND_ERROR "Looks like we're building from version control, but can't find git executable. Please set GIT_EXECUTABLE.") - ENDIF() -ENDIF() - +if (NOT DEFINED BUILDING_FROM_VCS) + set (BUILDING_FROM_VCS "NO") + if (GNC_VCS_INFO_RESULT EQUAL 0) + set (BUILDING_FROM_VCS "YES") + # IF building from VCS, we need git + find_package (Git) + if (NOT GIT_FOUND) + message (SEND_ERROR "Looks like we're building from version control, but can't find git executable. Please set GIT_EXECUTABLE.") + endif() + endif() +endif() IF (WIN32)