From 2b918959c91d626e84c18efe5e9854b6fa11125c Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 3 Sep 2017 23:46:35 +0000 Subject: [PATCH] Fix an issue with building in a sub-directory of a git-svn checkout 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 --- CMake/Modules/FindGitSubversion.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/Modules/FindGitSubversion.cmake b/CMake/Modules/FindGitSubversion.cmake index c913c37a7..3ee6b053d 100644 --- a/CMake/Modules/FindGitSubversion.cmake +++ b/CMake/Modules/FindGitSubversion.cmake @@ -43,14 +43,14 @@ if(GIT_FOUND) set(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}") 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 ERROR_VARIABLE Git_git_svn_info_error RESULT_VARIABLE Git_git_svn_info_result OUTPUT_STRIP_TRAILING_WHITESPACE) 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() string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"