From: Nico Weber <nicolasweber@gmx.de>
Date: Wed, 10 Dec 2014 00:10:21 +0000 (+0000)
Subject: cmake: Make SVNVersion.inc work on Windows if svn is called svn.bat.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=24d058a523b0ba30fa80f7f678e4a3e62fccab2d;p=oota-llvm.git

cmake: Make SVNVersion.inc work on Windows if svn is called svn.bat.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223864 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/modules/GetSVN.cmake b/cmake/modules/GetSVN.cmake
index 1f6075f4795..d512bd292cf 100644
--- a/cmake/modules/GetSVN.cmake
+++ b/cmake/modules/GetSVN.cmake
@@ -20,6 +20,11 @@ get_filename_component(LLVM_DIR "${LLVM_DIR}" PATH)
 set(ENV{TERM} "dumb")
 
 macro(get_source_info_svn path revision repository)
+  # If svn is a bat file, find_program(Subversion) doesn't find it.
+  # Explicitly search for that here; Subversion_SVN_EXECUTABLE will override
+  # the find_program call in FindSubversion.cmake.
+  find_program(Subversion_SVN_EXECUTABLE NAMES svn svn.bat)
+
   # FindSubversion does not work with symlinks. See PR 8437
   if (NOT IS_SYMLINK "${path}")
     find_package(Subversion)