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

Merge topic 'ExternalProject-ctest-config' 

ec00e89e ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators
5d739a3c ExternalProject: Simplify `cmake --build` configuration passing
This commit is contained in:
Brad King 2016-01-21 13:55:44 -05:00 committed by CMake Topic Stage
parent 184676532c ec00e89e83
commit 071c94eeac
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/ExternalProject.cmake
View File

@ -1230,9 +1230,9 @@ function(_ep_get_build_command name step cmd_var)
set(cmd "${CMAKE_COMMAND}")
endif()
set(args --build ".")
if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
list(APPEND args --config "${CMAKE_CFG_INTDIR}")
endif ()
if(CMAKE_CONFIGURATION_TYPES)
list(APPEND args --config $<CONFIG>)
endif()
if(step STREQUAL "INSTALL")
list(APPEND args --target install)
endif()
@ -1240,6 +1240,9 @@ function(_ep_get_build_command name step cmd_var)
if("x${step}x" STREQUAL "xTESTx")
string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd "${cmd}")
set(args "")
if(CMAKE_CONFIGURATION_TYPES)
list(APPEND args -C $<CONFIG>)
endif()
endif()
endif()
else()