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

ExternalProject: Propagate the generator platform 

When the CMAKE_GENERATOR option is given to ExternalProject_Add, look
also for option CMAKE_GENERATOR_PLATFORM to pass on to cmake as a cache
definition.  When no CMAKE_GENERATOR option is given explicitly then use
the current project's CMAKE_GENERATOR_PLATFORM (since we already use its
CMAKE_GENERATOR).
This commit is contained in:
Brad King 2014-09-05 15:20:47 -04:00
parent 8d33209170
commit 6944997bd6
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/ExternalProject.cmake
View File

@ -49,6 +49,7 @@
# [CONFIGURE_COMMAND cmd...] # Build tree configuration command # [CONFIGURE_COMMAND cmd...] # Build tree configuration command
# [CMAKE_COMMAND /.../cmake] # Specify alternative cmake executable # [CMAKE_COMMAND /.../cmake] # Specify alternative cmake executable
# [CMAKE_GENERATOR gen] # Specify generator for native build # [CMAKE_GENERATOR gen] # Specify generator for native build
# [CMAKE_GENERATOR_PLATFORM p] # Generator-specific platform name
# [CMAKE_GENERATOR_TOOLSET t] # Generator-specific toolset name # [CMAKE_GENERATOR_TOOLSET t] # Generator-specific toolset name
# [CMAKE_ARGS args...] # Arguments to CMake command line # [CMAKE_ARGS args...] # Arguments to CMake command line
# [CMAKE_CACHE_ARGS args...] # Initial cache arguments, of the form -Dvar:string=on # [CMAKE_CACHE_ARGS args...] # Initial cache arguments, of the form -Dvar:string=on
@ -1757,9 +1758,13 @@ function(_ep_add_configure_command name)
endif() endif()
get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR) get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
get_target_property(cmake_generator_platform ${name} _EP_CMAKE_GENERATOR_PLATFORM)
get_target_property(cmake_generator_toolset ${name} _EP_CMAKE_GENERATOR_TOOLSET) get_target_property(cmake_generator_toolset ${name} _EP_CMAKE_GENERATOR_TOOLSET)
if(cmake_generator) if(cmake_generator)
list(APPEND cmd "-G${cmake_generator}") list(APPEND cmd "-G${cmake_generator}")
if(cmake_generator_platform)
list(APPEND cmd "-DCMAKE_GENERATOR_PLATFORM=${cmake_generator_platform}")
endif()
if(cmake_generator_toolset) if(cmake_generator_toolset)
list(APPEND cmd "-T${cmake_generator_toolset}") list(APPEND cmd "-T${cmake_generator_toolset}")
endif() endif()
@ -1769,6 +1774,12 @@ function(_ep_add_configure_command name)
else() else()
list(APPEND cmd "-G${CMAKE_GENERATOR}") list(APPEND cmd "-G${CMAKE_GENERATOR}")
endif() endif()
if(cmake_generator_platform)
message(FATAL_ERROR "Option CMAKE_GENERATOR_PLATFORM not allowed without CMAKE_GENERATOR.")
endif()
if(CMAKE_GENERATOR_PLATFORM)
list(APPEND cmd "-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}")
endif()
if(cmake_generator_toolset) if(cmake_generator_toolset)
message(FATAL_ERROR "Option CMAKE_GENERATOR_TOOLSET not allowed without CMAKE_GENERATOR.") message(FATAL_ERROR "Option CMAKE_GENERATOR_TOOLSET not allowed without CMAKE_GENERATOR.")
endif() endif()