diff options
| author | Marcus D. Hanwell <marcus.hanwell@kitware.com> | 2010-11-13 00:43:05 (GMT) |
|---|---|---|
| committer | Marcus D. Hanwell <marcus.hanwell@kitware.com> | 2010-11-13 00:43:05 (GMT) |
| commit | 74e49aa441e4805b40b5e61348501f9143a5defe (patch) | |
| tree | 805d46bd9e321f229f790e4cd09c53e98d54e8af /Modules | |
| parent | e6975fe82fc682a47739f3fad695610f045447ae (diff) | |
| download | CMake-74e49aa441e4805b40b5e61348501f9143a5defe.zip CMake-74e49aa441e4805b40b5e61348501f9143a5defe.tar.gz CMake-74e49aa441e4805b40b5e61348501f9143a5defe.tar.bz2 | |
BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
This patch fixes the behavior of external projects with respect to
generators using the CMAKE_EXTRA_GENERATOR variable.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 997164a..1be6cfd 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1228,7 +1228,12 @@ function(_ep_add_configure_command name) if(cmake_generator) list(APPEND cmd "-G${cmake_generator}" "${source_dir}") else() - list(APPEND cmd "-G${CMAKE_GENERATOR}" "${source_dir}") + if(CMAKE_EXTRA_GENERATOR) + list(APPEND cmd "-G${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}" + "${source_dir}") + else() + list(APPEND cmd "-G${CMAKE_GENERATOR}" "${source_dir}") + endif() endif() endif() |