[Cmake-commits] [cmake-commits] david.cole committed ExternalProject.cmake 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv25340

Modified Files:
	ExternalProject.cmake 
Log Message:
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..."


Index: ExternalProject.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/ExternalProject.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** ExternalProject.cmake	24 Jun 2009 19:03:25 -0000	1.1
--- ExternalProject.cmake	2 Jul 2009 17:17:55 -0000	1.2
***************
*** 528,531 ****
--- 528,532 ----
    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)
***************
*** 535,539 ****
    set(comment)
    set(always)
!   if(cmd)
      set(work_dir ${source_dir})
    elseif(cvs_repository)
--- 536,541 ----
    set(comment)
    set(always)
! 
!   if(cmd_set)
      set(work_dir ${source_dir})
    elseif(cvs_repository)
***************
*** 570,576 ****
    ep_get(${name} source_dir)
  
!   set(work_dir)
    get_property(cmd TARGET ${name} PROPERTY _EP_PATCH_COMMAND)
!   if(cmd)
      set(work_dir ${source_dir})
    endif()
--- 572,581 ----
    ep_get(${name} source_dir)
  
!   get_property(cmd_set TARGET ${name} PROPERTY _EP_PATCH_COMMAND SET)
    get_property(cmd TARGET ${name} PROPERTY _EP_PATCH_COMMAND)
! 
!   set(work_dir)
! 
!   if(cmd_set)
      set(work_dir ${source_dir})
    endif()