diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-27 13:15:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-27 13:15:25 (GMT) |
| commit | 7910cb7cfb6b8a1dd3424327d667f6df5fc60b0a (patch) | |
| tree | 1863d1153cbaf03f3b9782cbf5ad92084d921e63 /Modules | |
| parent | a92f217a4bc8eb682b1b6b79076549314caffc1e (diff) | |
| parent | a704098de83460e8e9bae02434a6c31e7fc3ffd7 (diff) | |
| download | CMake-7910cb7cfb6b8a1dd3424327d667f6df5fc60b0a.zip CMake-7910cb7cfb6b8a1dd3424327d667f6df5fc60b0a.tar.gz CMake-7910cb7cfb6b8a1dd3424327d667f6df5fc60b0a.tar.bz2 | |
Merge topic 'fix-external-project-generator'
a704098d ExternalProject: fix the build command for generator overrides
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index d7b985d..0c73d41 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1197,7 +1197,10 @@ function(_ep_get_build_command name step cmd_var) else() set(cmd "${CMAKE_COMMAND}") 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") list(APPEND args --target install) endif() |