From 09084d89fb16a7ffc0d8ebf642cd478c51ad65ef Mon Sep 17 00:00:00 2001 From: David Cole Date: Tue, 9 Dec 2008 15:31:28 -0500 Subject: [PATCH] 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. --- Modules/AddExternalProject.cmake | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Modules/AddExternalProject.cmake b/Modules/AddExternalProject.cmake index 99b211227..454d2bdf4 100644 --- a/Modules/AddExternalProject.cmake +++ b/Modules/AddExternalProject.cmake @@ -398,7 +398,12 @@ function(add_external_project_build_command name) if(NOT cmd) set(cmd make) if(cfg_cmd_id STREQUAL "cmake") - set(cmd ${CMAKE_COMMAND}) + get_target_property(cfg_cmd ${name} AEP_CONFIGURE_COMMAND) + if(cfg_cmd) + set(cmd ${cfg_cmd}) + else() + set(cmd ${CMAKE_COMMAND}) + endif() endif() endif() @@ -443,7 +448,12 @@ function(add_external_project_install_command name) if(NOT cmd) set(cmd make) if(cfg_cmd_id STREQUAL "cmake") - set(cmd ${CMAKE_COMMAND}) + get_target_property(cfg_cmd ${name} AEP_CONFIGURE_COMMAND) + if(cfg_cmd) + set(cmd ${cfg_cmd}) + else() + set(cmd ${CMAKE_COMMAND}) + endif() endif() endif()