diff options
| author | Craig Scott <craig.scott@crascit.com> | 2023-08-21 21:23:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-08-21 21:23:51 (GMT) |
| commit | 0b1f542c4146f9137d2adf132503bbd0ac498a1c (patch) | |
| tree | 2417ba299ba8177358ffc91f0c672b4997ce92bd | |
| parent | 0788accdfcd8f29b3853e7e1e91325515c62f1bd (diff) | |
| parent | a1509658a0e49b49fe7a093300bd70dd31fb44e6 (diff) | |
| download | CMake-0b1f542c4146f9137d2adf132503bbd0ac498a1c.zip CMake-0b1f542c4146f9137d2adf132503bbd0ac498a1c.tar.gz CMake-0b1f542c4146f9137d2adf132503bbd0ac498a1c.tar.bz2 | |
Merge topic 'ep-svn-trust-cert-non-interactive'
a1509658a0 ExternalProject: Ensure svn --trust-server-cert has dependent options
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8745
| -rw-r--r-- | Modules/ExternalProject.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index dc9d2ce..36eb70e 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -2869,7 +2869,8 @@ function(_ep_add_download_command name) TARGET ${name} PROPERTY _EP_USES_TERMINAL_DOWNLOAD ) - if(uses_terminal) + # The --trust-server-cert option requires --non-interactive + if(uses_terminal AND NOT svn_trust_cert) set(svn_interactive_args "") else() set(svn_interactive_args "--non-interactive") @@ -3357,7 +3358,8 @@ function(_ep_add_update_command name) get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD) get_property(svn_trust_cert TARGET ${name} PROPERTY _EP_SVN_TRUST_CERT) get_property(uses_terminal TARGET ${name} PROPERTY _EP_USES_TERMINAL_UPDATE) - if(uses_terminal) + # The --trust-server-cert option requires --non-interactive + if(uses_terminal AND NOT svn_trust_cert) set(svn_interactive_args "") else() set(svn_interactive_args "--non-interactive") |