[Cmake-commits] CMake branch, next, updated. v2.8.4-1407-g9fd2412

[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  9fd241249c7057d86095cc3008dfeb75d1afd089 (commit)
       via  3a5a402a533b88e9f4810d07c1bfcb9e2c5abde4 (commit)
      from  4981808749aa66f014a0ac92c02c0458f19032b2 (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=9fd241249c7057d86095cc3008dfeb75d1afd089
commit 9fd241249c7057d86095cc3008dfeb75d1afd089
Merge: 4981808 3a5a402
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Apr 11 16:38:17 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 11 16:38:17 2011 -0400

    Merge topic 'add-svn-trust-cert-to-ExternalProject' into next
    
    3a5a402 ExternalProject: Add SVN_TRUST_CERT argument


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a5a402a533b88e9f4810d07c1bfcb9e2c5abde4
commit 3a5a402a533b88e9f4810d07c1bfcb9e2c5abde4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Apr 11 16:34:58 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Apr 11 16:34:58 2011 -0400

    ExternalProject: Add SVN_TRUST_CERT argument
    
    Which adds --non-interactive and --trust-server-cert to the svn
    checkout and update command lines. This allows ExternalProject
    clients to pull from an https:// based svn server even though
    the server may not have a valid or trusted certificate.
    
    Caveat emptor: I would NOT recommend using this except as a
    short-term work-around. Rather, the server should have a valid,
    trusted certificate, or the client should be using "http" instead
    of "https".

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 390b8f9..c910a56 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -18,6 +18,7 @@
 #    [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
+#    [SVN_TRUST_CERT 1 ]         # Trust the Subversion server site certificate
 #    [GIT_REPOSITORY url]        # URL of git repo
 #    [GIT_TAG tag]               # Git branch name, commit id or tag
 #    [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_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
     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(module)
@@ -1046,8 +1048,11 @@ function(_ep_add_download_command name)
     if(svn_password)
       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)
+    endif()
     set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision}
-      ${svn_user_pw_args} ${src_name})
+      ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
     list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
   elseif(git_repository)
     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_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
     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 "")
     if(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)
       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)
+    endif()
     set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision}
-      ${svn_user_pw_args})
+      ${svn_trust_cert_args} ${svn_user_pw_args})
     set(always 1)
   elseif(git_repository)
     if(NOT GIT_EXECUTABLE)
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 5158f31..4a542d7 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -100,6 +100,9 @@ ExternalProject_Add(${proj}
   STEP_TARGETS install update
   SVN_REPOSITORY ""
   SVN_REVISION ""
+  SVN_USERNAME ""
+  SVN_PASSWORD ""
+  SVN_TRUST_CERT 1
   TEST_COMMAND ""
   TIMEOUT ""
   URL ""

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

Summary of changes:
 Modules/ExternalProject.cmake        |   13 +++++++++++--
 Tests/ExternalProject/CMakeLists.txt |    3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake