[Cmake-commits] CMake branch, next, updated. v2.8.1-1234-ga677720
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed May 26 15:06:56 EDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via a677720dbd552b619fcfbfa88d767197971674f8 (commit)
via 672d9ba78cad1dabdf903596fdfc15d41bc5f341 (commit)
via 515339f3138721be5cd15dd7dee9ef5fe4f50b1b (commit)
via d5e86a5f45683119c94e966601cf88acdff64dfa (commit)
via 41e675a045780c0b247c226f89d5933567f793ae (commit)
via 37fb1f36902a88f10bddbefc4be17ed0be88fe4d (commit)
via ba88271427a0841ce2b7fbf98ff3ca163e59d3df (commit)
via 45e6aee72c6410fb094aae7828729476baea3337 (commit)
via b71b3b710fab3147ad30f852cac059508b703b96 (commit)
from d4deb208e8153dc3fb950805fdca855d69e1dd1a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a677720dbd552b619fcfbfa88d767197971674f8
commit a677720dbd552b619fcfbfa88d767197971674f8
Merge: d4deb20 672d9ba
Author: David Cole <david.cole at kitware.com>
Date: Wed May 26 14:54:28 2010 -0400
Merge branch 'add-svn-user-to-ExternalProject' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=672d9ba78cad1dabdf903596fdfc15d41bc5f341
commit 672d9ba78cad1dabdf903596fdfc15d41bc5f341
Author: David Cole <david.cole at kitware.com>
Date: Wed May 26 14:50:19 2010 -0400
Add svn user name and password to ExternalProject.
Thanks to JCFR for the leg work.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0302d5c..6479f4a 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -16,6 +16,8 @@
# [CVS_TAG tag] # Tag to checkout from CVS repo
# [SVN_REPOSITORY url] # URL of Subversion repo
# [SVN_REVISION rev] # Revision to checkout from Subversion repo
+# [SVN_USERNAME john ] # Username for Subversion checkout and update
+# [SVN_PASSWORD doe ] # Password for Subversion checkout and update
# [URL /.../src.tgz] # Full path or URL of source
# [TIMEOUT seconds] # Time allowed for file download operations
# #--Update/Patch step----------
@@ -661,8 +663,10 @@ function(_ep_add_download_command name)
endif()
get_property(svn_revision TARGET ${name} PROPERTY _EP_SVN_REVISION)
+ get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
+ get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD)
- set(repository ${svn_repository})
+ set(repository "${svn_repository} user=${svn_username} password=${svn_password}")
set(module)
set(tag ${svn_revision})
configure_file(
@@ -674,7 +678,8 @@ function(_ep_add_download_command name)
get_filename_component(src_name "${source_dir}" NAME)
get_filename_component(work_dir "${source_dir}" PATH)
set(comment "Performing download step (SVN checkout) for '${name}'")
- set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision} ${src_name})
+ set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision}
+ --username=${svn_username} --password=${svn_password} ${src_name})
list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
elseif(url)
get_filename_component(work_dir "${source_dir}" PATH)
@@ -757,7 +762,10 @@ function(_ep_add_update_command name)
set(work_dir ${source_dir})
set(comment "Performing update step (SVN update) for '${name}'")
get_property(svn_revision TARGET ${name} PROPERTY _EP_SVN_REVISION)
- set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision})
+ get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
+ get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD)
+ set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision}
+ --username=${svn_username} --password=${svn_password})
set(always 1)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 14 +++++++++++---
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list