diff options
| author | David Cole <david.cole@kitware.com> | 2011-10-25 19:34:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-25 19:34:37 (GMT) |
| commit | a17709974f371b43d7102f005d8243166060e356 (patch) | |
| tree | acdf2ef55f1aba2eb565a2ecc3b151f523f71ce3 /Tests | |
| parent | 7b555c0295222be2cd70dd60b5c1b52a890f668c (diff) | |
| parent | 6d79b50518d82a9bb116e527935d12498549fce9 (diff) | |
| download | CMake-a17709974f371b43d7102f005d8243166060e356.zip CMake-a17709974f371b43d7102f005d8243166060e356.tar.gz CMake-a17709974f371b43d7102f005d8243166060e356.tar.bz2 | |
Merge topic 'test-update-svn-1.7-issue-12535'
6d79b50 Teach CTest.UpdateSVN to detect svn add --depth before using it
74eb86c Fix CTest.UpdateSVN with Subversion 1.7 (#12535)
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CTestUpdateSVN.cmake.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in index 97b2a07..edafb4ef 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 ${dirs_added} + COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added} ) endif(dirs_added) run_child( |