[Cmake-commits] [cmake-commits] king committed AddExternalProject.cmake 1.18 1.19

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Mar 30 11:38:32 EDT 2009


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

Modified Files:
	AddExternalProject.cmake 
Log Message:
ENH: Simpler AddExternalProject build 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.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** AddExternalProject.cmake	30 Mar 2009 15:38:05 -0000	1.18
--- AddExternalProject.cmake	30 Mar 2009 15:38:26 -0000	1.19
***************
*** 507,534 ****
    get_configure_build_working_dir(${name} working_dir)
  
!   get_target_property(cmd ${name} AEP_BUILD_COMMAND)
!   if(cmd STREQUAL "")
!     # Explicit empty string means no build step for this project
!     add_custom_command(
!       OUTPUT ${sentinels_dir}/${name}-build
!       COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-build
!       WORKING_DIRECTORY ${working_dir}
!       COMMENT "No build step for '${name}'"
!       DEPENDS ${sentinels_dir}/${name}-configure
!       VERBATIM
!       )
    else()
      _aep_get_build_command(${name} BUILD cmd)
- 
-     add_custom_command(
-       OUTPUT ${sentinels_dir}/${name}-build
-       COMMAND ${cmd}
-       COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-build
-       WORKING_DIRECTORY ${working_dir}
-       COMMENT "Performing build step for '${name}'"
-       DEPENDS ${sentinels_dir}/${name}-configure
-       VERBATIM
-       )
    endif()
  endfunction(add_external_project_build_command)
  
--- 507,521 ----
    get_configure_build_working_dir(${name} working_dir)
  
!   get_property(cmd_set TARGET ${name} PROPERTY AEP_BUILD_COMMAND SET)
!   if(cmd_set)
!     get_property(cmd TARGET ${name} PROPERTY AEP_BUILD_COMMAND)
    else()
      _aep_get_build_command(${name} BUILD cmd)
    endif()
+   add_external_project_step(${name} build
+     COMMAND ${cmd}
+     WORKING_DIRECTORY ${working_dir}
+     DEPENDEES configure
+     )
  endfunction(add_external_project_build_command)
  



More information about the Cmake-commits mailing list