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

Merge topic 'fix-external-project-generator'

Browse Source 
a704098d ExternalProject: fix the build command for generator overrides
This commit is contained in:
Brad King 2015-03-27 09:15:25 -04:00 committed by CMake Topic Stage
commit 7910cb7cfb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/ExternalProject.cmake
View File

@ -1197,7 +1197,10 @@ function(_ep_get_build_command name step cmd_var)
else() else()
set(cmd "${CMAKE_COMMAND}") set(cmd "${CMAKE_COMMAND}")
endif() endif()
set(args --build ${binary_dir} --config ${CMAKE_CFG_INTDIR}) set(args --build ".")
if (CMAKE_CFG_INTDIR AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
list(APPEND args --config "${CMAKE_CFG_INTDIR}")
endif ()
if(step STREQUAL "INSTALL") if(step STREQUAL "INSTALL")
list(APPEND args --target install) list(APPEND args --target install)
endif() endif()