[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.18 1.19

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Do not unzip the local repositories unless CVS and SVN executables are available. Add 'configure' step to the repository extraction 'projects' to print the version number of CVS and SVN in the dashboard test/build output.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** CMakeLists.txt	26 Jun 2009 13:55:35 -0000	1.18
--- CMakeLists.txt	26 Jun 2009 15:32:04 -0000	1.19
***************
*** 59,88 ****
  
  
- # Unzip/untar the repositories in our source folder so that other
- # projects below may use them to test the various source control
- # systems
- #
- set(proj SetupLocalCVSRepository)
- set(local_cvs_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/CVS")
- ep_add(${proj}
-   SOURCE_DIR ${local_cvs_repo}
-   URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz
-   BUILD_COMMAND ""
-   CONFIGURE_COMMAND ""
-   INSTALL_COMMAND ""
- )
- 
- set(proj SetupLocalSVNRepository)
- set(local_svn_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/SVN")
- set(local_svn_repo_url "file:///${local_svn_repo}/TutorialStep1")
- ep_add(${proj}
-   SOURCE_DIR ${local_svn_repo}
-   URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz
-   BUILD_COMMAND ""
-   CONFIGURE_COMMAND ""
-   INSTALL_COMMAND ""
- )
- 
- 
  # Local DIR:
  #
--- 59,62 ----
***************
*** 147,150 ****
--- 121,137 ----
  
  if(CVS_EXECUTABLE)
+   # Unzip/untar the CVS repository in our source folder so that other
+   # projects below may use it to test CVS args of ep_add
+   #
+   set(proj SetupLocalCVSRepository)
+   set(local_cvs_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/CVS")
+   ep_add(${proj}
+     SOURCE_DIR ${local_cvs_repo}
+     URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz
+     BUILD_COMMAND ""
+     CONFIGURE_COMMAND ${CVS_EXECUTABLE} --version
+     INSTALL_COMMAND ""
+   )
+ 
    # CVS by date stamp:
    #
***************
*** 197,200 ****
--- 184,201 ----
  
  if(Subversion_SVN_EXECUTABLE)
+   # Unzip/untar the SVN repository in our source folder so that other
+   # projects below may use it to test SVN args of ep_add
+   #
+   set(proj SetupLocalSVNRepository)
+   set(local_svn_repo "${CMAKE_CURRENT_BINARY_DIR}/LocalRepositories/SVN")
+   set(local_svn_repo_url "file:///${local_svn_repo}/TutorialStep1")
+   ep_add(${proj}
+     SOURCE_DIR ${local_svn_repo}
+     URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz
+     BUILD_COMMAND ""
+     CONFIGURE_COMMAND ${Subversion_SVN_EXECUTABLE} --version
+     INSTALL_COMMAND ""
+   )
+ 
    # SVN by date stamp:
    #