diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-09 13:59:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-09 13:59:45 (GMT) |
| commit | 25003baf50fa31f331fd2abef74dcb41b9db2c06 (patch) | |
| tree | 774c278aa6fc5455faad255b19c8c00b371fa1ef /Source | |
| parent | 2c553c56b4d9b063179115d7c2ef980c0af33c51 (diff) | |
| parent | b764c7c2731614147c3e4e6379c47df7a92bc3e3 (diff) | |
| download | CMake-25003baf50fa31f331fd2abef74dcb41b9db2c06.zip CMake-25003baf50fa31f331fd2abef74dcb41b9db2c06.tar.gz CMake-25003baf50fa31f331fd2abef74dcb41b9db2c06.tar.bz2 | |
Merge topic 'vs_buildcache_support'
b764c7c273 VS: Add property to turn off Visual Studio compile batching
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6957
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 8ffb664..86ca640 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3309,7 +3309,9 @@ void cmVisualStudio10TargetGenerator::WriteClOptions( } else if (this->MSTools) { cmsys::RegularExpression clangToolset("v[0-9]+_clang_.*"); const char* toolset = this->GlobalGenerator->GetPlatformToolset(); - if (toolset && clangToolset.find(toolset)) { + cmValue noCompileBatching = + this->GeneratorTarget->GetProperty("VS_NO_COMPILE_BATCHING"); + if (noCompileBatching.IsOn() || (toolset && clangToolset.find(toolset))) { e2.Element("ObjectFileName", "$(IntDir)%(filename).obj"); } else { e2.Element("ObjectFileName", "$(IntDir)"); |