kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
David Cole 2008-12-09 15:31:28 -05:00
parent e51969ac49
commit 09084d89fb
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/AddExternalProject.cmake
View File

@ -398,9 +398,14 @@ function(add_external_project_build_command name)
if(NOT cmd) if(NOT cmd)
set(cmd make) set(cmd make)
if(cfg_cmd_id STREQUAL "cmake") 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}) set(cmd ${CMAKE_COMMAND})
endif() endif()
endif() endif()
endif()
get_target_property(args ${name} AEP_BUILD_ARGS) get_target_property(args ${name} AEP_BUILD_ARGS)
if(NOT args) if(NOT args)
@ -443,9 +448,14 @@ function(add_external_project_install_command name)
if(NOT cmd) if(NOT cmd)
set(cmd make) set(cmd make)
if(cfg_cmd_id STREQUAL "cmake") 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}) set(cmd ${CMAKE_COMMAND})
endif() endif()
endif() endif()
endif()
get_target_property(args ${name} AEP_INSTALL_ARGS) get_target_property(args ${name} AEP_INSTALL_ARGS)
if(NOT args) if(NOT args)