[Cmake-commits] [cmake-commits] king committed AddExternalProject.cmake 1.6 1.7

[cmake-commits at cmake.org]

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

Modified Files:
	AddExternalProject.cmake 
Log Message:
ENH: Allow empty arguments in external project API

This uses the get_property command to simplify property lookup in the
AddExternalProject module.  It distinguishes for build and install
argument properties the cases of unset and set to empty.


Index: AddExternalProject.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/AddExternalProject.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** AddExternalProject.cmake	24 Dec 2008 15:10:40 -0000	1.6
--- AddExternalProject.cmake	4 Mar 2009 14:21:16 -0000	1.7
***************
*** 128,136 ****
      endif()
  
!     get_target_property(tag ${name} AEP_CVS_TAG)
!     set(cvs_tag)
!     if(tag)
!       set(cvs_tag ${tag})
!     endif()
  
      set(args -d ${cvs_repository} -q co ${cvs_tag} -d ${name} ${cvs_module})
--- 128,132 ----
      endif()
  
!     get_property(cvs_tag TARGET ${name} PROPERTY AEP_CVS_TAG)
  
      set(args -d ${cvs_repository} -q co ${cvs_tag} -d ${name} ${cvs_module})
***************
*** 165,173 ****
      endif()
  
!     get_target_property(tag ${name} AEP_SVN_TAG)
!     set(svn_tag)
!     if(tag)
!       set(svn_tag ${tag})
!     endif()
  
      set(args co ${svn_repository} ${svn_tag} ${name})
--- 161,165 ----
      endif()
  
!     get_property(svn_tag TARGET ${name} PROPERTY AEP_SVN_TAG)
  
      set(args co ${svn_repository} ${svn_tag} ${name})
***************
*** 357,365 ****
      endif()
  
!     get_target_property(tag ${name} AEP_CVS_TAG)
!     set(cvs_tag)
!     if(tag)
!       set(cvs_tag ${tag})
!     endif()
  
      set(args -d ${cvs_repository} -q up -dP ${cvs_tag})
--- 349,353 ----
      endif()
  
!     get_property(cvs_tag TARGET ${name} PROPERTY AEP_CVS_TAG)
  
      set(args -d ${cvs_repository} -q up -dP ${cvs_tag})
***************
*** 386,394 ****
      endif()
  
!     get_target_property(tag ${name} AEP_SVN_TAG)
!     set(svn_tag)
!     if(tag)
!       set(svn_tag ${tag})
!     endif()
  
      set(args up ${svn_tag})
--- 374,378 ----
      endif()
  
!     get_property(svn_tag TARGET ${name} PROPERTY AEP_SVN_TAG)
  
      set(args up ${svn_tag})
***************
*** 424,431 ****
    get_configure_build_working_dir(${name} working_dir)
  
!   get_target_property(file_deps ${name} AEP_FILE_DEPENDS)
!   if(NOT file_deps)
!     set(file_deps)
!   endif()
    #message(STATUS "info: name='${name}' file_deps='${file_deps}'")
  
--- 408,412 ----
    get_configure_build_working_dir(${name} working_dir)
  
!   get_property(file_deps TARGET ${name} PROPERTY AEP_FILE_DEPENDS)
    #message(STATUS "info: name='${name}' file_deps='${file_deps}'")
  
***************
*** 505,510 ****
      endif()
  
!     get_target_property(args ${name} AEP_BUILD_ARGS)
!     if(NOT args)
        set(args)
        if(cfg_cmd_id STREQUAL "cmake")
--- 486,493 ----
      endif()
  
!     get_property(have_args TARGET ${name} PROPERTY AEP_BUILD_ARGS SET)
!     if(have_args)
!       get_target_property(args ${name} AEP_BUILD_ARGS)
!     else()
        set(args)
        if(cfg_cmd_id STREQUAL "cmake")
***************
*** 556,561 ****
      endif()
  
!     get_target_property(args ${name} AEP_INSTALL_ARGS)
!     if(NOT args)
        set(args)
        if(cfg_cmd_id STREQUAL "cmake")
--- 539,546 ----
      endif()
  
!     get_property(have_args TARGET ${name} PROPERTY AEP_INSTALL_ARGS SET)
!     if(have_args)
!       get_target_property(args ${name} AEP_INSTALL_ARGS)
!     else()
        set(args)
        if(cfg_cmd_id STREQUAL "cmake")