summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2014-12-10 00:10:21 +0000
committerNico Weber <nicolasweber@gmx.de>2014-12-10 00:10:21 +0000
commita33c5942a3ea1c171fd0cca8c9bf68d606c093d7 (patch)
treebe5fbf972110878a42da2fa6c0cbbcd0066842cf
parent4d47f7f52bbdcbedd5c59e6076ad68a5312f5898 (diff)
downloadbcm5719-llvm-a33c5942a3ea1c171fd0cca8c9bf68d606c093d7.tar.gz
bcm5719-llvm-a33c5942a3ea1c171fd0cca8c9bf68d606c093d7.zip
cmake: Make SVNVersion.inc work on Windows if svn is called svn.bat.
llvm-svn: 223864
-rw-r--r--llvm/cmake/modules/GetSVN.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/cmake/modules/GetSVN.cmake b/llvm/cmake/modules/GetSVN.cmake
index 1f6075f4795..d512bd292cf 100644
--- a/llvm/cmake/modules/GetSVN.cmake
+++ b/llvm/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)
OpenPOWER on IntegriCloud