diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-07-21 11:18:50 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-21 07:19:02 -0400 |
| commit | 8abeec58f339f804ad5cb4a58a75e20f0dc878a1 (patch) | |
| tree | 4b67a7ecf4251b9a69b299e6ff226306d58a836b /Source/cmGlobalXCodeGenerator.h | |
| parent | cd580a99bdaa658487d7080279c9d394545c4f10 (diff) | |
| parent | 26673bf48011a48fe0ad01e97409a32c1f50143d (diff) | |
| download | cmake-8abeec58f339f804ad5cb4a58a75e20f0dc878a1.tar.gz | |
Merge topic 'xcode-native-arch'
26673bf480 Xcode: Explicitly specify default native architecture on macOS
ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5023
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index 276a9eec4a..7018de7908 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -109,6 +109,7 @@ public: bool ShouldStripResourcePath(cmMakefile*) const override; + bool SetSystemName(std::string const& s, cmMakefile* mf) override; bool SetGeneratorToolset(std::string const& ts, bool build, cmMakefile* mf) override; void AppendFlag(std::string& flags, std::string const& flag) const; @@ -301,6 +302,7 @@ private: std::vector<std::string> Architectures; std::string ObjectDirArchDefault; std::string ObjectDirArch; + std::string SystemName; std::string GeneratorToolset; std::map<cmGeneratorTarget const*, size_t> TargetOrderIndex; std::vector<std::string> EnabledLangs; |