Merge topic 'EP-extra-generator'

74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
This commit is contained in:
David Cole 2010-11-16 14:46:46 -05:00 committed by CMake Topic Stage
commit 164b11deb7

View File

@ -1227,10 +1227,15 @@ function(_ep_add_configure_command name)
get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
if(cmake_generator)
list(APPEND cmd "-G${cmake_generator}" "${source_dir}")
else()
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()
# If anything about the configure command changes, (command itself, cmake
# used, cmake args or cmake generator) then re-run the configure step.