gnucash unstable: Revert "Allow user to override BUILDING_FROM_VCS"

Geert Janssens gjanssens at code.gnucash.org
Tue Jan 30 15:25:19 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/18059726 (commit)
	from  https://github.com/Gnucash/gnucash/commit/32a19612 (commit)



commit 1805972646807bcdd203ae9a96ed8dc13f642582
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Jan 30 21:24:22 2018 +0100

    Revert "Allow user to override BUILDING_FROM_VCS"
    
    This reverts commit ec9d5feba1e3d72ca890a5aa22ceee8917c0a4d5.
    
    This doesn't do what I had in mind. I'll come up with a
    better solution shortly.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31a5928..283424e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)



Summary of changes:
 CMakeLists.txt | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)



More information about the gnucash-changes mailing list