[Cmake-commits] [cmake-commits] king committed AddExternalProject.cmake 1.16 1.17

[cmake-commits at cmake.org]

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

Modified Files:
	AddExternalProject.cmake 
Log Message:
ENH: Simpler AddExternalProject patch step

This simplifies the implementation with add_external_project_step.


Index: AddExternalProject.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/AddExternalProject.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** AddExternalProject.cmake	30 Mar 2009 15:37:29 -0000	1.16
--- AddExternalProject.cmake	30 Mar 2009 15:37:50 -0000	1.17
***************
*** 436,460 ****
      sentinels_dir source_dir tmp_dir)
  
!   get_target_property(cmd ${name} AEP_PATCH_COMMAND)
    if(cmd)
!     add_custom_command(
!       OUTPUT ${sentinels_dir}/${name}-patch
!       COMMAND ${cmd}
!       COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-patch
!       WORKING_DIRECTORY ${source_dir}/${name}
!       COMMENT "Performing patch step for '${name}'"
!       DEPENDS ${sentinels_dir}/${name}-download
!       VERBATIM
!       )
!     return()
    endif()
  
!   add_custom_command(
!     OUTPUT ${sentinels_dir}/${name}-patch
!     COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-patch
!     WORKING_DIRECTORY ${sentinels_dir}
!     COMMENT "No patch step for '${name}'"
!     DEPENDS ${sentinels_dir}/${name}-download
!     VERBATIM
      )
  endfunction(add_external_project_patch_command)
--- 436,449 ----
      sentinels_dir source_dir tmp_dir)
  
!   set(work_dir)
!   get_property(cmd TARGET ${name} PROPERTY AEP_PATCH_COMMAND)
    if(cmd)
!     set(work_dir ${source_dir}/${name})
    endif()
  
!   add_external_project_step(${name} patch
!     COMMAND ${cmd}
!     WORKING_DIRECTORY ${work_dir}
!     DEPENDEES download
      )
  endfunction(add_external_project_patch_command)