diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-05 13:33:40 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-05 08:33:50 -0500 |
| commit | 4b062c77b3a439910d5dcff16e273e1a0f811d64 (patch) | |
| tree | d48f55b51c899225b931d0509c5e9fea8aed3e7e /Source/cmGlobalVisualStudio10Generator.h | |
| parent | 9a5fe4e48c199216214e3400336085f9bef48d69 (diff) | |
| parent | 9135954e2fe607c08e065601c52958652e11b684 (diff) | |
| download | cmake-4b062c77b3a439910d5dcff16e273e1a0f811d64.tar.gz | |
Merge topic 'vs-version-for-unity'
9135954e2f VS: Do not use native unity builds on VS 2017 versions less than 15.8
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4324
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 21207859c5..f659ff3e37 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -115,6 +115,8 @@ public: virtual bool IsDefaultToolset(const std::string& version) const; virtual std::string GetAuxiliaryToolset() const; + bool GetSupportsUnityBuilds() const { return this->SupportsUnityBuilds; } + bool FindMakeProgram(cmMakefile* mf) override; bool IsIPOSupported() const override { return true; } @@ -180,6 +182,7 @@ protected: std::string DefaultMasmFlagTableName; std::string DefaultNasmFlagTableName; std::string DefaultRCFlagTableName; + bool SupportsUnityBuilds = false; bool SystemIsWindowsCE; bool SystemIsWindowsPhone; bool SystemIsWindowsStore; |