Fix ODR violation waiting to happen by making static function definitions in VectorUt...

[oota-llvm.git] / cmake / modules / GetSVN.cmake

diff --git a/cmake/modules/GetSVN.cmake b/cmake/modules/GetSVN.cmake
index 1f6075f4795e9dfd6b02d42be9d9b0ee6c078c69..d512bd292cf43f3f875e5063b5725e1fc6597f89 100644 (file)
--- 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)