diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-24 14:36:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-24 14:36:09 (GMT) |
| commit | 83f8697d0e1bb003d930236baf7b8708b2c8ba4a (patch) | |
| tree | 4c6e24dcaab1340c3b1185f927da1aebf2637a99 | |
| parent | 73144a8f1c9cf31f79ac852aa75e1c75819c6062 (diff) | |
| parent | 67f4759b55c6e6de592b3ed425ce8228e1f59b50 (diff) | |
| download | CMake-83f8697d0e1bb003d930236baf7b8708b2c8ba4a.zip CMake-83f8697d0e1bb003d930236baf7b8708b2c8ba4a.tar.gz CMake-83f8697d0e1bb003d930236baf7b8708b2c8ba4a.tar.bz2 | |
Merge branch 'fix-ExternalProject-test-failures'
| -rw-r--r-- | Modules/ExternalProject.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
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() |