diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-05 13:33:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-05 13:33:50 (GMT) |
| commit | 4b062c77b3a439910d5dcff16e273e1a0f811d64 (patch) | |
| tree | d48f55b51c899225b931d0509c5e9fea8aed3e7e /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 9a5fe4e48c199216214e3400336085f9bef48d69 (diff) | |
| parent | 9135954e2fe607c08e065601c52958652e11b684 (diff) | |
| download | CMake-4b062c77b3a439910d5dcff16e273e1a0f811d64.zip CMake-4b062c77b3a439910d5dcff16e273e1a0f811d64.tar.gz CMake-4b062c77b3a439910d5dcff16e273e1a0f811d64.tar.bz2 | |
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.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index fd65584..ccb6c50 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -250,6 +250,12 @@ bool cmGlobalVisualStudio10Generator::SetGeneratorToolset( } } + this->SupportsUnityBuilds = + this->Version >= cmGlobalVisualStudioGenerator::VS16 || + (this->Version == cmGlobalVisualStudioGenerator::VS15 && + cmSystemTools::PathExists(this->VCTargetsPath + + "/Microsoft.Cpp.Unity.targets")); + if (this->GeneratorToolsetCuda.empty()) { // Find the highest available version of the CUDA tools. std::vector<std::string> cudaTools; |