Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 02:17:27 +08:00
Code Issues Projects Releases Wiki Activity

FindSubversion: Do not accept macOS stub without Xcode implementation

Browse Source 
Xcode no longer provides a `svn` implementation, but the `/usr/bin/svn`
stub may still exist.
This commit is contained in:
Brad King
2020-05-28 11:33:53 -04:00
parent e647949539
commit 2c0db404d1
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/FindSubversion.cmake
View File

@@ -79,13 +79,22 @@ if(Subversion_SVN_EXECUTABLE)
execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} --version execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} --version
OUTPUT_VARIABLE Subversion_VERSION_SVN OUTPUT_VARIABLE Subversion_VERSION_SVN
ERROR_VARIABLE _Subversion_VERSION_STDERR
RESULT_VARIABLE _Subversion_VERSION_RESULT
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
# restore the previous LC_ALL # restore the previous LC_ALL
set(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL}) set(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
string(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*" if(_Subversion_VERSION_RESULT EQUAL 0)
"\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}") string(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
"\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
else()
unset(Subversion_VERSION_SVN)
if(_Subversion_VERSION_STDERR MATCHES "svn: error: The subversion command line tools are no longer provided by Xcode")
set(Subversion_SVN_EXECUTABLE Subversion_SVN_EXECUTABLE-NOTFOUND)
endif()
endif()
macro(Subversion_WC_INFO dir prefix) macro(Subversion_WC_INFO dir prefix)