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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Avoid running the cvs portions of the ExternalProject test on non-cygwin builds that are using cygwin cvs.exe.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** CMakeLists.txt	26 Jun 2009 17:00:39 -0000	1.20
--- CMakeLists.txt	29 Jun 2009 14:46:45 -0000	1.21
***************
*** 120,124 ****
--- 120,137 ----
  
  
+ set(do_cvs_tests 0)
+ 
  if(CVS_EXECUTABLE)
+   set(do_cvs_tests 1)
+ endif()
+ 
+ if(do_cvs_tests AND NOT UNIX)
+   if("${CVS_EXECUTABLE}" MATCHES "cygwin")
+     message(STATUS "No ExternalProject cvs tests with cygwin cvs.exe outside cygwin!")
+     set(do_cvs_tests 0)
+   endif()
+ endif()
+ 
+ if(do_cvs_tests)
    # Unzip/untar the CVS repository in our source folder so that other
    # projects below may use it to test CVS args of ep_add
***************
*** 183,187 ****
--- 196,206 ----
  
  
+ set(do_svn_tests 0)
+ 
  if(Subversion_SVN_EXECUTABLE)
+   set(do_svn_tests 1)
+ endif()
+ 
+ if(do_svn_tests)
    # Unzip/untar the SVN repository in our source folder so that other
    # projects below may use it to test SVN args of ep_add
***************
*** 264,268 ****
    "${binary_base}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9)
  
! if(CVS_EXECUTABLE)
    add_test(TutorialStep1-CVS-20090626-BuildTreeTest
      "${binary_base}/TutorialStep1-CVS-20090626/Tutorial" 4)
--- 283,287 ----
    "${binary_base}/TutorialStep1-LocalNoDirTGZ/Tutorial" 9)
  
! if(do_cvs_tests)
    add_test(TutorialStep1-CVS-20090626-BuildTreeTest
      "${binary_base}/TutorialStep1-CVS-20090626/Tutorial" 4)
***************
*** 275,279 ****
  endif()
  
! if(Subversion_SVN_EXECUTABLE)
    add_test(TutorialStep1-SVN-20090626-BuildTreeTest
      "${binary_base}/TutorialStep1-SVN-20090626/Tutorial" 100)
--- 294,298 ----
  endif()
  
! if(do_svn_tests)
    add_test(TutorialStep1-SVN-20090626-BuildTreeTest
      "${binary_base}/TutorialStep1-SVN-20090626/Tutorial" 100)