kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
David Cole 2010-06-23 07:04:06 -04:00
parent b141862564
commit 67f4759b55
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/ExternalProject.cmake
View File

@ -358,7 +358,7 @@ endif()
endfunction(_ep_write_verifyfile_script) 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 "") set(args "")
if(filename MATCHES "(\\.bz2|\\.tar\\.gz|\\.tgz|\\.zip)$") if(filename MATCHES "(\\.bz2|\\.tar\\.gz|\\.tgz|\\.zip)$")
@ -391,10 +391,10 @@ endif()
# Prepare a space for extracting: # Prepare a space for extracting:
# #
set(i 1234) set(i 1234)
while(EXISTS \"\${directory}/../ex\${i}\") while(EXISTS \"\${directory}/../ex-${name}\${i}\")
math(EXPR i \"\${i} + 1\") math(EXPR i \"\${i} + 1\")
endwhile() endwhile()
set(ut_dir \"\${directory}/../ex\${i}\") set(ut_dir \"\${directory}/../ex-${name}\${i}\")
file(MAKE_DIRECTORY \"\${ut_dir}\") file(MAKE_DIRECTORY \"\${ut_dir}\")
# Extract it: # Extract it:
@ -895,8 +895,7 @@ function(_ep_add_download_command name)
endif() endif()
_ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${md5}") _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${md5}")
list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake) 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" "${name}" "${file}" "${source_dir}")
_ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${file}" "${source_dir}")
list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake) list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
endif() endif()
else() else()