https://github.com/Kitware/CMake
Revision 84a1e67380207bafaceefe1c19b47513c0fb63b2 authored by Brad King on 08 April 2020, 15:35:32 UTC, committed by Brad King on 08 April 2020, 17:40:09 UTC
The `CMAKE_OSX_ARCHITECTURES` value is not used directly by generators. It is used to initialize a per-target `OSX_ARCHITECTURES` property, but that property can also be set explicitly by project code to a subset of the full list of architectures. In order to handle this case, construct a mapping from each `CMAKE_OSX_ARCHITECTURES` entry to the corresponding `CMAKE_APPLE_ARCH_SYSROOTS` entry by name. Use the mapping to find the sysroot for each entry in `OSX_ARCHITECTURES` for a given target. If `CMAKE_APPLE_ARCH_SYSROOTS` does not have the same length as `CMAKE_OSX_ARCHITECTURES`, error out early rather than risking a crash or assertion failure. Fixes: #20534
1 parent 45fa9b3
Tip revision: 84a1e67380207bafaceefe1c19b47513c0fb63b2 authored by Brad King on 08 April 2020, 15:35:32 UTC
Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES
Apple: Fix mapping CMAKE_APPLE_ARCH_SYSROOTS to custom OSX_ARCHITECTURES
Tip revision: 84a1e67
| File | Mode | Size |
|---|---|---|
| .github | ||
| Auxiliary | ||
| Help | ||
| Licenses | ||
| Modules | ||
| Packaging | ||
| Source | ||
| Templates | ||
| Tests | ||
| Utilities | ||
| .clang-format | -rw-r--r-- | 1.3 KB |
| .clang-tidy | -rw-r--r-- | 1010 bytes |
| .gitattributes | -rw-r--r-- | 1.1 KB |
| .gitignore | -rw-r--r-- | 132 bytes |
| .hooks-config | -rw-r--r-- | 418 bytes |
| CMakeCPack.cmake | -rw-r--r-- | 9.7 KB |
| CMakeCPackOptions.cmake.in | -rw-r--r-- | 11.9 KB |
| CMakeGraphVizOptions.cmake | -rw-r--r-- | 153 bytes |
| CMakeLists.txt | -rw-r--r-- | 31.0 KB |
| CMakeLogo.gif | -rw-r--r-- | 4.4 KB |
| CONTRIBUTING.rst | -rw-r--r-- | 3.1 KB |
| CTestConfig.cmake | -rw-r--r-- | 440 bytes |
| CTestCustom.cmake.in | -rw-r--r-- | 6.7 KB |
| CompileFlags.cmake | -rw-r--r-- | 4.2 KB |
| Copyright.txt | -rw-r--r-- | 5.2 KB |
| DartConfig.cmake | -rw-r--r-- | 374 bytes |
| README.rst | -rw-r--r-- | 3.9 KB |
| bootstrap | -rwxr-xr-x | 53.2 KB |
| cmake_uninstall.cmake.in | -rw-r--r-- | 789 bytes |
| configure | -rwxr-xr-x | 99 bytes |
| doxygen.config | -rw-r--r-- | 27.4 KB |
Computing file changes ...
