[Cmake-commits] CMake branch, next, updated. v2.8.6-1651-g62015f6

[Brad King]

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  62015f6f64141f27a67f4063a297ac9d6cb201f2 (commit)
       via  6d79b50518d82a9bb116e527935d12498549fce9 (commit)
      from  9d6fbcb5a3940f2d2125ebadb73ac2793a5f3bfc (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=62015f6f64141f27a67f4063a297ac9d6cb201f2
commit 62015f6f64141f27a67f4063a297ac9d6cb201f2
Merge: 9d6fbcb 6d79b50
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 24 17:36:43 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 24 17:36:43 2011 -0400

    Merge topic 'test-update-svn-1.7-issue-12535' into next
    
    6d79b50 Teach CTest.UpdateSVN to detect svn add --depth before using it


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d79b50518d82a9bb116e527935d12498549fce9
commit 6d79b50518d82a9bb116e527935d12498549fce9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 24 17:33:29 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 24 17:34:55 2011 -0400

    Teach CTest.UpdateSVN to detect svn add --depth before using it
    
    Older svn versions do not have the --depth option for "svn add".
    Fortunately we do not need it for versions that old.  Look for the
    option and use it only when available.

diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in
index e18dfc9..edafb4e 100644
--- a/Tests/CTestUpdateSVN.cmake.in
+++ b/Tests/CTestUpdateSVN.cmake.in
@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config)
 set(SVNCMD ${SVN} --config-dir ${TOP}/config)
 set(SVNUSER --username "test author" --non-interactive)
 
+# Configure for this svn version.
+execute_process(
+  COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add
+  )
+if("${help_add}" MATCHES "--depth")
+  set(depth_empty "--depth=empty")
+else()
+  set(depth_empty "")
+endif()
+
 #-----------------------------------------------------------------------------
 # Initialize the testing directory.
 message("Creating test directory...")
@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added)
 if(dirs_added)
   run_child(
     WORKING_DIRECTORY ${TOP}/user-source
-    COMMAND ${SVNCMD} add --depth=empty ${dirs_added}
+    COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added}
     )
 endif(dirs_added)
 run_child(

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

Summary of changes:
 Tests/CTestUpdateSVN.cmake.in |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake