Revert "Allow user to override BUILDING_FROM_VCS"

This reverts commit ec9d5feba1.

This doesn't do what I had in mind. I'll come up with a
better solution shortly.
This commit is contained in:
Geert Janssens 2018-01-30 21:24:22 +01:00
parent 32a196122f
commit 1805972646

View File

@ -134,17 +134,16 @@ EXECUTE_PROCESS(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
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()
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 (WIN32)