diff options
| author | David Cole <david.cole@kitware.com> | 2009-07-02 17:17:55 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-07-02 17:17:55 (GMT) |
| commit | 04fb177de14eff9c54e1decb3668c084daf7e3d7 (patch) | |
| tree | a0120dad2c59d0e8cdefb6f44d3efadca2a867c1 /Modules | |
| parent | 767b82a6c85a04b74888f040dce4fd72587b8ba8 (diff) | |
| download | CMake-04fb177de14eff9c54e1decb3668c084daf7e3d7.zip CMake-04fb177de14eff9c54e1decb3668c084daf7e3d7.tar.gz CMake-04fb177de14eff9c54e1decb3668c084daf7e3d7.tar.bz2 | |
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..."
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 1b5270f..9221814 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -527,6 +527,7 @@ endfunction(_ep_add_download_command) function(_ep_add_update_command name) 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(cvs_repository TARGET ${name} PROPERTY _EP_CVS_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(comment) set(always) - if(cmd) + + if(cmd_set) set(work_dir ${source_dir}) elseif(cvs_repository) if(NOT CVS_EXECUTABLE) @@ -569,9 +571,12 @@ endfunction(_ep_add_update_command) function(_ep_add_patch_command name) 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) - if(cmd) + + set(work_dir) + + if(cmd_set) set(work_dir ${source_dir}) endif() |