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

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
parent cb727a20df 74e49aa441
commit 164b11deb7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/ExternalProject.cmake
View File

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