diff options
| author | David Cole <david.cole@kitware.com> | 2011-04-18 15:34:00 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-04-18 15:34:00 (GMT) |
| commit | 12a3699372277916d11af5fe1eb2768e704ecb33 (patch) | |
| tree | 8edc6565e7711cb41a1013168198953d735317b8 /Modules/ExternalProject.cmake | |
| parent | 3a5a402a533b88e9f4810d07c1bfcb9e2c5abde4 (diff) | |
| download | CMake-12a3699372277916d11af5fe1eb2768e704ecb33.zip CMake-12a3699372277916d11af5fe1eb2768e704ecb33.tar.gz CMake-12a3699372277916d11af5fe1eb2768e704ecb33.tar.bz2 | |
ExternalProject: Always use --non-interactive with svn
The previous commit added --non-interactive as a "side effect"
of turning on SVN_TRUST_CERT. While reviewing that commit, we
decided all ExternalProject svn usage should be non-interactive.
That way, if there's any sort of problem, svn will return an
error right away rather than hang forever waiting for input...
Diffstat (limited to 'Modules/ExternalProject.cmake')
| -rw-r--r-- | Modules/ExternalProject.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index c910a56..a37771b 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1049,10 +1049,10 @@ function(_ep_add_download_command name) set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}") endif() if(svn_trust_cert) - set(svn_trust_cert_args --non-interactive --trust-server-cert) + set(svn_trust_cert_args --trust-server-cert) endif() set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision} - ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name}) + --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name}) list(APPEND depends ${stamp_dir}/${name}-svninfo.txt) elseif(git_repository) find_package(Git) @@ -1205,10 +1205,10 @@ function(_ep_add_update_command name) set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}") endif() if(svn_trust_cert) - set(svn_trust_cert_args --non-interactive --trust-server-cert) + set(svn_trust_cert_args --trust-server-cert) endif() set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision} - ${svn_trust_cert_args} ${svn_user_pw_args}) + --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args}) set(always 1) elseif(git_repository) if(NOT GIT_EXECUTABLE) |