| 1 |
dilfridge 11/11/23 20:39:10 |
| 2 |
|
| 3 |
Added: cmake-2.8.6-testsvn17.patch |
| 4 |
Log: |
| 5 |
Fix test CTest.UpdateSVN with subversion-1.7, bug 390533 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.37/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/cmake/files/cmake-2.8.6-testsvn17.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cmake-2.8.6-testsvn17.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in |
| 18 |
index 97b2a07..edafb4ef 100644 |
| 19 |
--- a/Tests/CTestUpdateSVN.cmake.in |
| 20 |
+++ b/Tests/CTestUpdateSVN.cmake.in |
| 21 |
@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config) |
| 22 |
set(SVNCMD ${SVN} --config-dir ${TOP}/config) |
| 23 |
set(SVNUSER --username "test author" --non-interactive) |
| 24 |
|
| 25 |
+# Configure for this svn version. |
| 26 |
+execute_process( |
| 27 |
+ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add |
| 28 |
+ ) |
| 29 |
+if("${help_add}" MATCHES "--depth") |
| 30 |
+ set(depth_empty "--depth=empty") |
| 31 |
+else() |
| 32 |
+ set(depth_empty "") |
| 33 |
+endif() |
| 34 |
+ |
| 35 |
#----------------------------------------------------------------------------- |
| 36 |
# Initialize the testing directory. |
| 37 |
message("Creating test directory...") |
| 38 |
@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added) |
| 39 |
if(dirs_added) |
| 40 |
run_child( |
| 41 |
WORKING_DIRECTORY ${TOP}/user-source |
| 42 |
- COMMAND ${SVNCMD} add ${dirs_added} |
| 43 |
+ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added} |
| 44 |
) |
| 45 |
endif(dirs_added) |
| 46 |
run_child( |
Archives