[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.21 1.22

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv4127/Tests/ExternalProject

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Exclude svn portions of ExternalProject test when: svn client version is less than 1.2 or cygwin/non-cygwin mismatch detected -- avoids ExternalProject test failures on dash5 and dash22-cygwin. Also, non-code change: allow cvslock through Windows firewall to prevent ExternalProject test failure on dash1vista32.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** CMakeLists.txt	29 Jun 2009 14:46:45 -0000	1.21
--- CMakeLists.txt	1 Jul 2009 17:48:38 -0000	1.22
***************
*** 202,205 ****
--- 202,231 ----
  endif()
  
+ # Only do svn tests with svn >= version 1.2
+ #
+ if(do_svn_tests)
+   execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} --version
+     OUTPUT_VARIABLE Subversion_VERSION_SVN
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+   string(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
+     "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
+   message(STATUS "Subversion_VERSION_SVN='${Subversion_VERSION_SVN}'")
+ 
+   if(Subversion_VERSION_SVN VERSION_LESS 1.2)
+     message(STATUS "No ExternalProject svn tests with svn client less than version 1.2")
+     set(do_svn_tests 0)
+   endif()
+ endif()
+ 
+ # Only do svn tests in cygwin/cygwin or not-cygwin/not-cygwin arrangements:
+ #
+ if(do_svn_tests)
+   if(CMAKE_CURRENT_BINARY_DIR MATCHES "cygdrive/" AND
+      NOT "${Subversion_SVN_EXECUTABLE}" MATCHES "cygwin")
+     message(STATUS "No ExternalProject svn tests with non-cygwin svn client in a /cygdrive based build")
+     set(do_svn_tests 0)
+   endif()
+ endif()
+ 
  if(do_svn_tests)
    # Unzip/untar the SVN repository in our source folder so that other