[Cmake-commits] CMake branch, next, updated. v2.8.2-1100-gad236f3

[David Cole]

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  ad236f3b5b16af531ef70f015e8087c829bf125c (commit)
       via  6e1282f840fe50707c928079465ab315f07a59fe (commit)
       via  91b5bc3efa814ba27cbc52280edc363f8991d0cc (commit)
       via  e42160f3e057a338f5f5ac22bd4362b779a66254 (commit)
      from  db16b4c5e8edd9983e85f8c5c036a462c5456c5a (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=ad236f3b5b16af531ef70f015e8087c829bf125c
commit ad236f3b5b16af531ef70f015e8087c829bf125c
Merge: db16b4c 6e1282f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 22 16:31:20 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 22 16:31:20 2010 -0400

    Merge topic 'fix-11173' into next
    
    6e1282f ExternalProject: No svn --username if empty (#11173)
    91b5bc3 KWSys Nightly Date Stamp
    e42160f KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e1282f840fe50707c928079465ab315f07a59fe
commit 6e1282f840fe50707c928079465ab315f07a59fe
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 22 16:09:07 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Oct 22 16:23:27 2010 -0400

    ExternalProject: No svn --username if empty (#11173)
    
    Nor --password. But please do if non-empty. Thank you.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d76796f..f3c907f 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -985,8 +985,15 @@ 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(svn_user_pw_args "")
+    if(svn_username)
+      set(svn_user_pw_args ${svn_user_pw_args} "--username=${svn_username}")
+    endif()
+    if(svn_password)
+      set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
+    endif()
     set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision}
-      --username=${svn_username} --password=${svn_password} ${src_name})
+      ${svn_user_pw_args} ${src_name})
     list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
   elseif(git_repository)
     find_package(Git)
@@ -1125,8 +1132,15 @@ function(_ep_add_update_command name)
     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(svn_user_pw_args "")
+    if(svn_username)
+      set(svn_user_pw_args ${svn_user_pw_args} "--username=${svn_username}")
+    endif()
+    if(svn_password)
+      set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
+    endif()
     set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision}
-      --username=${svn_username} --password=${svn_password})
+      ${svn_user_pw_args})
     set(always 1)
   elseif(git_repository)
     if(NOT GIT_EXECUTABLE)

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake     |   18 ++++++++++++++++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake