[Cmake-commits] [cmake-commits] david.cole committed AddExternalProject.cmake 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	AddExternalProject.cmake 
Log Message:
ENH: Default to the same cmake used for configuring when building and installing. If none specified default to the cmake used to configure the outer/aggregating project.


Index: AddExternalProject.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/AddExternalProject.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** AddExternalProject.cmake	8 Dec 2008 19:58:59 -0000	1.3
--- AddExternalProject.cmake	9 Dec 2008 20:31:28 -0000	1.4
***************
*** 399,403 ****
        set(cmd make)
        if(cfg_cmd_id STREQUAL "cmake")
!         set(cmd ${CMAKE_COMMAND})
        endif()
      endif()
--- 399,408 ----
        set(cmd make)
        if(cfg_cmd_id STREQUAL "cmake")
!         get_target_property(cfg_cmd ${name} AEP_CONFIGURE_COMMAND)
!         if(cfg_cmd)
!           set(cmd ${cfg_cmd})
!         else()
!           set(cmd ${CMAKE_COMMAND})
!         endif()
        endif()
      endif()
***************
*** 444,448 ****
        set(cmd make)
        if(cfg_cmd_id STREQUAL "cmake")
!         set(cmd ${CMAKE_COMMAND})
        endif()
      endif()
--- 449,458 ----
        set(cmd make)
        if(cfg_cmd_id STREQUAL "cmake")
!         get_target_property(cfg_cmd ${name} AEP_CONFIGURE_COMMAND)
!         if(cfg_cmd)
!           set(cmd ${cfg_cmd})
!         else()
!           set(cmd ${CMAKE_COMMAND})
!         endif()
        endif()
      endif()