[Cmake-commits] [cmake-commits] king committed AddExternalProject.cmake 1.19 1.20
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Mar 30 11:38:46 EDT 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv29965/Modules
Modified Files:
AddExternalProject.cmake
Log Message:
ENH: Simpler AddExternalProject install 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.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** AddExternalProject.cmake 30 Mar 2009 15:38:26 -0000 1.19
--- AddExternalProject.cmake 30 Mar 2009 15:38:43 -0000 1.20
***************
*** 526,553 ****
get_configure_build_working_dir(${name} working_dir)
! get_target_property(cmd ${name} AEP_INSTALL_COMMAND)
! if(cmd STREQUAL "")
! # Explicit empty string means no install step for this project
! add_custom_command(
! OUTPUT ${sentinels_dir}/${name}-install
! COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-install
! WORKING_DIRECTORY ${working_dir}
! COMMENT "No install step for '${name}'"
! DEPENDS ${sentinels_dir}/${name}-build
! VERBATIM
! )
else()
_aep_get_build_command(${name} INSTALL cmd)
-
- add_custom_command(
- OUTPUT ${sentinels_dir}/${name}-install
- COMMAND ${cmd}
- COMMAND ${CMAKE_COMMAND} -E touch ${sentinels_dir}/${name}-install
- WORKING_DIRECTORY ${working_dir}
- COMMENT "Performing install step for '${name}'"
- DEPENDS ${sentinels_dir}/${name}-build
- VERBATIM
- )
endif()
endfunction(add_external_project_install_command)
--- 526,540 ----
get_configure_build_working_dir(${name} working_dir)
! get_property(cmd_set TARGET ${name} PROPERTY AEP_INSTALL_COMMAND SET)
! if(cmd_set)
! get_property(cmd TARGET ${name} PROPERTY AEP_INSTALL_COMMAND)
else()
_aep_get_build_command(${name} INSTALL cmd)
endif()
+ add_external_project_step(${name} install
+ COMMAND ${cmd}
+ WORKING_DIRECTORY ${working_dir}
+ DEPENDEES build
+ )
endfunction(add_external_project_install_command)
More information about the Cmake-commits
mailing list