diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-17 13:41:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-17 13:41:37 (GMT) |
| commit | cd569b962dbeaa7ea718021c16582cddd158df3a (patch) | |
| tree | 67b357ab206985b5a8b9de70a35e17ed5cb0c8a1 /Modules | |
| parent | f6d66b04a36c263d8cc6c01d9b628168dae42d85 (diff) | |
| parent | e3fc2899c89fb075a695d6140eaadf11db85d96c (diff) | |
| download | CMake-cd569b962dbeaa7ea718021c16582cddd158df3a.zip CMake-cd569b962dbeaa7ea718021c16582cddd158df3a.tar.gz CMake-cd569b962dbeaa7ea718021c16582cddd158df3a.tar.bz2 | |
Merge topic 'ios-install-combined-one-arch'
e3fc2899 Fix iOS combined feature for single architecture targets
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeIOSInstallCombined.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Modules/CMakeIOSInstallCombined.cmake b/Modules/CMakeIOSInstallCombined.cmake index f052a3b..1256f56 100644 --- a/Modules/CMakeIOSInstallCombined.cmake +++ b/Modules/CMakeIOSInstallCombined.cmake @@ -52,7 +52,14 @@ function(_ios_install_combined_get_build_setting sdk variable resultvar) endif() if(NOT output MATCHES " ${variable} = ([^\n]*)") - message(FATAL_ERROR "${variable} not found.") + if("${variable}" STREQUAL "VALID_ARCHS") + # VALID_ARCHS may be unset by user for given SDK + # (e.g. for build without simulator). + set("${resultvar}" "" PARENT_SCOPE) + return() + else() + message(FATAL_ERROR "${variable} not found.") + endif() endif() set("${resultvar}" "${CMAKE_MATCH_1}" PARENT_SCOPE) @@ -72,6 +79,9 @@ function(_ios_install_combined_get_valid_archs sdk resultvar) list(REMOVE_ITEM valid_archs "") # remove empty elements list(REMOVE_DUPLICATES valid_archs) + string(REPLACE ";" " " printable "${valid_archs}") + _ios_install_combined_message("Architectures (${sdk}): ${printable}") + set("${resultvar}" "${valid_archs}" PARENT_SCOPE) endfunction() |