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

ExternalProject: Simplify `cmake --build` configuration passing 

Check CMAKE_CONFIGURATION_TYPES instead of CMAKE_CFG_INTDIR in order
to recognize multi-config generators.  Then use $<CONFIG> to pass
the configuration value.
This commit is contained in:
Brad King 2016-01-19 16:07:28 -05:00
parent c13ed96401
commit 5d739a3c84
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/ExternalProject.cmake
View File

@ -1230,9 +1230,9 @@ function(_ep_get_build_command name step cmd_var)
set(cmd "${CMAKE_COMMAND}") set(cmd "${CMAKE_COMMAND}")
endif() endif()
set(args --build ".") set(args --build ".")
if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL ".") if(CMAKE_CONFIGURATION_TYPES)
list(APPEND args --config "${CMAKE_CFG_INTDIR}") list(APPEND args --config $<CONFIG>)
endif () endif()
if(step STREQUAL "INSTALL") if(step STREQUAL "INSTALL")
list(APPEND args --target install) list(APPEND args --target install)
endif() endif()