diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-16 19:46:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-16 19:46:46 (GMT) |
| commit | 164b11deb735e33e9dd14becac71288689617dda (patch) | |
| tree | 21e987a80d55667b4e9cc7a8e010476b69a87670 | |
| parent | cb727a20df7414c3c1d1f75153f73f93abe6ca07 (diff) | |
| parent | 74e49aa441e4805b40b5e61348501f9143a5defe (diff) | |
| download | CMake-164b11deb735e33e9dd14becac71288689617dda.zip CMake-164b11deb735e33e9dd14becac71288689617dda.tar.gz CMake-164b11deb735e33e9dd14becac71288689617dda.tar.bz2 | |
Merge topic 'EP-extra-generator'
74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
| -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() |