From 19e8752b86a015832b3414f55a298bda9896fc62 Mon Sep 17 00:00:00 2001 From: Frank Park Date: Fri, 15 Apr 2016 14:02:07 -0400 Subject: [PATCH] FindGit: Add new 'GitHub for Windows' user directory GitHub for Windows now installs in $ENV{LOCALAPPDATA}/Github/PortableGit*/cmd instead of $ENV{LOCALAPPDATA}/Github/PortableGit*/bin Search the new location first but keep the old one in case people have older versions installed. --- Modules/FindGit.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake index d18f965ee..95188cec7 100644 --- a/Modules/FindGit.cmake +++ b/Modules/FindGit.cmake @@ -45,8 +45,10 @@ if(WIN32) if(NOT CMAKE_GENERATOR MATCHES "MSYS") set(git_names git.cmd git eg.cmd eg) # GitHub search path for Windows - set(github_path "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin") - file(GLOB github_path "${github_path}") + file(GLOB github_path + "$ENV{LOCALAPPDATA}/Github/PortableGit*/cmd" + "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin" + ) # SourceTree search path for Windows set(_git_sourcetree_path "$ENV{LOCALAPPDATA}/Atlassian/SourceTree/git_local/bin") endif()