diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-29 11:11:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-29 11:11:57 (GMT) |
| commit | 1e4aaa31dd619dd2685f51489e66f6d9d8a8fe9c (patch) | |
| tree | 8910dd64f662dd66990f3728a00d958ce75694a5 | |
| parent | e647949539f4704a00eddac2357d59ceeb8bc0ca (diff) | |
| parent | 2c0db404d17a239aa2d549ffeaf8fb1292d4d217 (diff) | |
| download | CMake-1e4aaa31dd619dd2685f51489e66f6d9d8a8fe9c.zip CMake-1e4aaa31dd619dd2685f51489e66f6d9d8a8fe9c.tar.gz CMake-1e4aaa31dd619dd2685f51489e66f6d9d8a8fe9c.tar.bz2 | |
Merge topic 'FindSubversion-xcode-removed' into release-3.17
2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4813
| -rw-r--r-- | Modules/FindSubversion.cmake | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake index ce280e2..07cb770 100644 --- a/Modules/FindSubversion.cmake +++ b/Modules/FindSubversion.cmake @@ -79,13 +79,22 @@ if(Subversion_SVN_EXECUTABLE) execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} --version OUTPUT_VARIABLE Subversion_VERSION_SVN + ERROR_VARIABLE _Subversion_VERSION_STDERR + RESULT_VARIABLE _Subversion_VERSION_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE) # restore the previous LC_ALL set(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL}) - string(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*" - "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}") + if(_Subversion_VERSION_RESULT EQUAL 0) + 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) |