w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-30 20:40:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue with building in a sub-directory of a git-svn checkout

Browse Source 
Thanks to Mike NF4E for the  original issue report and patch that this
change was based on.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8072 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-09-03 23:46:35 +00:00
parent e1bf0ec197
commit 2b918959c9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/Modules/FindGitSubversion.cmake
View File

@ -43,14 +43,14 @@ if(GIT_FOUND)
set(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}") set(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
set(ENV{LC_ALL} C) set(ENV{LC_ALL} C)
execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${dir}/.git --work-tree=${dir} svn info execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${dir}/.git svn info
OUTPUT_VARIABLE ${prefix}_WC_INFO OUTPUT_VARIABLE ${prefix}_WC_INFO
ERROR_VARIABLE Git_git_svn_info_error ERROR_VARIABLE Git_git_svn_info_error
RESULT_VARIABLE Git_git_svn_info_result RESULT_VARIABLE Git_git_svn_info_result
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT ${Git_git_svn_info_result} EQUAL 0) if(NOT ${Git_git_svn_info_result} EQUAL 0)
message(SEND_ERROR "Command \"${GIT_EXECUTABLE} --git-dir=${dir}/.git --work-tree=${dir} svn info\" failed with output:\n${Git_git_svn_info_error}") message(SEND_ERROR "Command \"${GIT_EXECUTABLE} --git-dir=${dir}/.git svn info\" failed with output:\n${Git_git_svn_info_error}")
else() else()
string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*" string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"