[Cmake-commits] CMake branch, next, updated. v2.8.1-1476-g04c04e5

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  04c04e59692b75cadb9ccd9ab7b43c151eaf200e (commit)
       via  67f4759b55c6e6de592b3ed425ce8228e1f59b50 (commit)
       via  b1418625645ebef66e54d75004c82d88807e154f (commit)
      from  c58a3d16c86f7ccb9e1ccfa96a9fa6a179403e85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04c04e59692b75cadb9ccd9ab7b43c151eaf200e
commit 04c04e59692b75cadb9ccd9ab7b43c151eaf200e
Merge: c58a3d1 67f4759
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 23 07:05:47 2010 -0400

    Merge branch 'fix-ExternalProject-test-failures' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67f4759b55c6e6de592b3ed425ce8228e1f59b50
commit 67f4759b55c6e6de592b3ed425ce8228e1f59b50
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 23 07:04:06 2010 -0400

    Qualify name of extraction location with ExternalProject name.
    
    Avoid issues with two external projects trying to extract two
    separate trees at the same time into the same location. Should
    fix the sporadically failing ExternalProject test on the dashboards
    for parallel builds.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d0845e6..8c249dc 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -358,7 +358,7 @@ endif()
 endfunction(_ep_write_verifyfile_script)
 
 
-function(_ep_write_extractfile_script script_filename filename directory)
+function(_ep_write_extractfile_script script_filename name filename directory)
   set(args "")
 
   if(filename MATCHES "(\\.bz2|\\.tar\\.gz|\\.tgz|\\.zip)$")
@@ -391,10 +391,10 @@ endif()
 # Prepare a space for extracting:
 #
 set(i 1234)
-while(EXISTS \"\${directory}/../ex\${i}\")
+while(EXISTS \"\${directory}/../ex-${name}\${i}\")
   math(EXPR i \"\${i} + 1\")
 endwhile()
-set(ut_dir \"\${directory}/../ex\${i}\")
+set(ut_dir \"\${directory}/../ex-${name}\${i}\")
 file(MAKE_DIRECTORY \"\${ut_dir}\")
 
 # Extract it:
@@ -895,8 +895,7 @@ function(_ep_add_download_command name)
       endif()
       _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${md5}")
       list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake)
-      # TODO: Support other archive formats.
-      _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${file}" "${source_dir}")
+      _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}")
       list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
     endif()
   else()

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake     |    9 ++++-----
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake