gnucash unstable: Multiple changes pushed

[Geert Janssens]

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



commit 32a196122f33dbe342a29c57a5bbcefa5a8410ed
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Jan 30 19:21:22 2018 +0100

    Properly detect git in case of linked worktree

diff --git a/util/gnc-vcs-info b/util/gnc-vcs-info
index 7cf3ece..a24b4be 100755
--- a/util/gnc-vcs-info
+++ b/util/gnc-vcs-info
@@ -106,7 +106,7 @@ fi
 # If we get here then this is NOT an svn checkout.
 # Maybe it's git?
 real_gitdir="${real_srcdir}"/.git
-if test -d "${real_gitdir}"
+if test -d "${real_gitdir}" || test -e "${real_gitdir}"
 then
   # If we're only interested in the vcs type, then we're done here
   if [ "$request" = "type" ]

commit ec9d5feba1e3d72ca890a5aa22ceee8917c0a4d5
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Jan 30 19:20:51 2018 +0100

    Allow user to override BUILDING_FROM_VCS

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



Summary of changes:
 CMakeLists.txt    | 21 +++++++++++----------
 util/gnc-vcs-info |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)