kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'add-svn-trust-cert-to-ExternalProject'

Browse Source 
12a3699 ExternalProject: Always use --non-interactive with svn
3a5a402 ExternalProject: Add SVN_TRUST_CERT argument
This commit is contained in:
Brad King 2011-04-19 14:08:18 -04:00 committed by CMake Topic Stage
commit 4d2d9d44e6
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/ExternalProject.cmake
View File

@ -18,6 +18,7 @@
# [SVN_REVISION rev] # Revision to checkout from Subversion repo # [SVN_REVISION rev] # Revision to checkout from Subversion repo
# [SVN_USERNAME john ] # Username for Subversion checkout and update # [SVN_USERNAME john ] # Username for Subversion checkout and update
# [SVN_PASSWORD doe ] # Password for Subversion checkout and update # [SVN_PASSWORD doe ] # Password for Subversion checkout and update
# [SVN_TRUST_CERT 1 ] # Trust the Subversion server site certificate
# [GIT_REPOSITORY url] # URL of git repo # [GIT_REPOSITORY url] # URL of git repo
# [GIT_TAG tag] # Git branch name, commit id or tag # [GIT_TAG tag] # Git branch name, commit id or tag
# [URL /.../src.tgz] # Full path or URL of source # [URL /.../src.tgz] # Full path or URL of source
@ -1026,6 +1027,7 @@ function(_ep_add_download_command name)
get_property(svn_revision TARGET ${name} PROPERTY _EP_SVN_REVISION) get_property(svn_revision TARGET ${name} PROPERTY _EP_SVN_REVISION)
get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME) get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD) get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD)
get_property(svn_trust_cert TARGET ${name} PROPERTY _EP_SVN_TRUST_CERT)
set(repository "${svn_repository} user=${svn_username} password=${svn_password}") set(repository "${svn_repository} user=${svn_username} password=${svn_password}")
set(module) set(module)
@ -1046,8 +1048,11 @@ function(_ep_add_download_command name)
if(svn_password) if(svn_password)
set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}") set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
endif() endif()
if(svn_trust_cert)
set(svn_trust_cert_args --trust-server-cert)
endif()
set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision} set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision}
${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) list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
elseif(git_repository) elseif(git_repository)
find_package(Git) find_package(Git)
@ -1191,6 +1196,7 @@ function(_ep_add_update_command name)
get_property(svn_revision TARGET ${name} PROPERTY _EP_SVN_REVISION) get_property(svn_revision TARGET ${name} PROPERTY _EP_SVN_REVISION)
get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME) get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD) get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD)
get_property(svn_trust_cert TARGET ${name} PROPERTY _EP_SVN_TRUST_CERT)
set(svn_user_pw_args "") set(svn_user_pw_args "")
if(svn_username) if(svn_username)
set(svn_user_pw_args ${svn_user_pw_args} "--username=${svn_username}") set(svn_user_pw_args ${svn_user_pw_args} "--username=${svn_username}")
@ -1198,8 +1204,11 @@ function(_ep_add_update_command name)
if(svn_password) if(svn_password)
set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}") set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
endif() endif()
if(svn_trust_cert)
set(svn_trust_cert_args --trust-server-cert)
endif()
set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision} set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision}
${svn_user_pw_args}) --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args})
set(always 1) set(always 1)
elseif(git_repository) elseif(git_repository)
if(NOT GIT_EXECUTABLE) if(NOT GIT_EXECUTABLE)

3
Tests/ExternalProject/CMakeLists.txt
View File

@ -100,6 +100,9 @@ ExternalProject_Add(${proj}
STEP_TARGETS install update STEP_TARGETS install update
SVN_REPOSITORY "" SVN_REPOSITORY ""
SVN_REVISION "" SVN_REVISION ""
SVN_USERNAME ""
SVN_PASSWORD ""
SVN_TRUST_CERT 1
TEST_COMMAND "" TEST_COMMAND ""
TIMEOUT "" TIMEOUT ""
URL "" URL ""