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

BUG: cmd_set logic was missing from update and patch steps. Fix it so that UPDATE_COMMAND "" means "no update step even though this is a CVS/SVN repository..."

This commit is contained in:
David Cole 2009-07-02 13:17:55 -04:00
parent 767b82a6c8
commit 04fb177de1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/ExternalProject.cmake
View File

@ -527,6 +527,7 @@ endfunction(_ep_add_download_command)
function(_ep_add_update_command name) function(_ep_add_update_command name)
ep_get(${name} source_dir) ep_get(${name} source_dir)
get_property(cmd_set TARGET ${name} PROPERTY _EP_UPDATE_COMMAND SET)
get_property(cmd TARGET ${name} PROPERTY _EP_UPDATE_COMMAND) get_property(cmd TARGET ${name} PROPERTY _EP_UPDATE_COMMAND)
get_property(cvs_repository TARGET ${name} PROPERTY _EP_CVS_REPOSITORY) get_property(cvs_repository TARGET ${name} PROPERTY _EP_CVS_REPOSITORY)
get_property(svn_repository TARGET ${name} PROPERTY _EP_SVN_REPOSITORY) get_property(svn_repository TARGET ${name} PROPERTY _EP_SVN_REPOSITORY)
@ -534,7 +535,8 @@ function(_ep_add_update_command name)
set(work_dir) set(work_dir)
set(comment) set(comment)
set(always) set(always)
if(cmd)
if(cmd_set)
set(work_dir ${source_dir}) set(work_dir ${source_dir})
elseif(cvs_repository) elseif(cvs_repository)
if(NOT CVS_EXECUTABLE) if(NOT CVS_EXECUTABLE)
@ -569,9 +571,12 @@ endfunction(_ep_add_update_command)
function(_ep_add_patch_command name) function(_ep_add_patch_command name)
ep_get(${name} source_dir) ep_get(${name} source_dir)
set(work_dir) get_property(cmd_set TARGET ${name} PROPERTY _EP_PATCH_COMMAND SET)
get_property(cmd TARGET ${name} PROPERTY _EP_PATCH_COMMAND) get_property(cmd TARGET ${name} PROPERTY _EP_PATCH_COMMAND)
if(cmd)
set(work_dir)
if(cmd_set)
set(work_dir ${source_dir}) set(work_dir ${source_dir})
endif() endif()