diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-08 17:44:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-08 17:44:42 (GMT) |
| commit | da25220d83c25ceabad09b8386fb004b53400bd4 (patch) | |
| tree | fbe1c5b94d8ea3ecc5ea1c2419dc8f5893aeda8a /Modules/Platform | |
| parent | 37fa5122c2c1e2138b9e01191dc3cc1800f6ba40 (diff) | |
| parent | 84a1e67380207bafaceefe1c19b47513c0fb63b2 (diff) | |
| download | CMake-da25220d83c25ceabad09b8386fb004b53400bd4.zip CMake-da25220d83c25ceabad09b8386fb004b53400bd4.tar.gz CMake-da25220d83c25ceabad09b8386fb004b53400bd4.tar.bz2 | |
Merge branch 'backport-3.17-apple-arch-sysroots' into apple-arch-sysroots
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Darwin-Initialize.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index 729217c..80e668e 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -136,7 +136,7 @@ endfunction() # Handle multi-arch sysroots. Do this before CMAKE_OSX_SYSROOT is # transformed into a path, so that we know the sysroot name. function(_apple_resolve_multi_arch_sysroots) - if(CMAKE_APPLE_ARCH_SYSROOTS) + if(DEFINED CMAKE_APPLE_ARCH_SYSROOTS) return() # Already cached endif() @@ -202,7 +202,7 @@ function(_apple_resolve_multi_arch_sysroots) list(APPEND _arch_sysroots ${_arch_sysroot}) else() message(WARNING "No SDK found for architecture '${arch}'") - list(APPEND _arch_sysroots "") # Placeholder + list(APPEND _arch_sysroots "${arch}-SDK-NOTFOUND") endif() endforeach() |