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 /Source/cmLocalGenerator.h | |
| 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 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 25ed265..71cc63e 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -514,6 +514,7 @@ protected: std::map<std::string, std::string> VariableMappings; std::string CompilerSysroot; std::string LinkerSysroot; + std::unordered_map<std::string, std::string> AppleArchSysroots; bool EmitUniversalBinaryFlags; |