[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-474-g55d42cf

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  55d42cf319cdfff989b67f14d560a6c571c0eb55 (commit)
       via  57f701a7f045fc13807933860bad22fa405c6621 (commit)
      from  49a71eaca1bbc813bee09ccf674e6022fa8116b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55d42cf319cdfff989b67f14d560a6c571c0eb55
commit 55d42cf319cdfff989b67f14d560a6c571c0eb55
Merge: 49a71ea 57f701a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 15:24:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:24:34 2015 -0400

    Merge topic 'FindGit-Atlassian-SourceTree' into next
    
    57f701a7 FindGit: Search in 'Atlassian SourceTree' user directory (#15758)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57f701a7f045fc13807933860bad22fa405c6621
commit 57f701a7f045fc13807933860bad22fa405c6621
Author:     Kevin Wojniak <kainjow at kainjow.com>
AuthorDate: Mon Oct 12 12:06:26 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 15:22:38 2015 -0400

    FindGit: Search in 'Atlassian SourceTree' user directory (#15758)

diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake
index b4f7b4b..2c3e5fd 100644
--- a/Modules/FindGit.cmake
+++ b/Modules/FindGit.cmake
@@ -48,17 +48,21 @@ if(WIN32)
     # GitHub search path for Windows
     set(github_path "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin")
     file(GLOB github_path "${github_path}")
+    # SourceTree search path for Windows
+    set(_git_sourcetree_path "$ENV{LOCALAPPDATA}/Atlassian/SourceTree/git_local/bin")
   endif()
 endif()
 
 find_program(GIT_EXECUTABLE
   NAMES ${git_names}
-  PATHS ${github_path}
+  PATHS ${github_path} ${_git_sourcetree_path}
   PATH_SUFFIXES Git/cmd Git/bin
   DOC "git command line client"
   )
 mark_as_advanced(GIT_EXECUTABLE)
 
+unset(_git_sourcetree_path)
+
 if(GIT_EXECUTABLE)
   execute_process(COMMAND ${GIT_EXECUTABLE} --version
                   OUTPUT_VARIABLE git_version

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGit.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake