[llvm] r223864 - cmake: Make SVNVersion.inc work on Windows if svn is called svn.bat.

Nico Weber nicolasweber at gmx.de
Tue Dec 9 16:10:21 PST 2014


Author: nico
Date: Tue Dec  9 18:10:21 2014
New Revision: 223864

URL: http://llvm.org/viewvc/llvm-project?rev=223864&view=rev
Log:
cmake: Make SVNVersion.inc work on Windows if svn is called svn.bat.

Modified:
    llvm/trunk/cmake/modules/GetSVN.cmake

Modified: llvm/trunk/cmake/modules/GetSVN.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/GetSVN.cmake?rev=223864&r1=223863&r2=223864&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/GetSVN.cmake (original)
+++ llvm/trunk/cmake/modules/GetSVN.cmake Tue Dec  9 18:10:21 2014
@@ -20,6 +20,11 @@ get_filename_component(LLVM_DIR "${LLVM_
 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)





More information about the llvm-commits mailing list