diff options
author | Brad King <brad.king@kitware.com> | 2021-11-11 12:07:02 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-11-11 12:16:11 (GMT) |
commit | ea289314ef473d6bcdc1ca858aac6cdb15ecf56a (patch) | |
tree | b6e5f0c1030eec364b572328719c2b6f3b9e00d3 /Source/cmVisualStudio10TargetGenerator.cxx | |
parent | 53990059daed056fc5a2c15df70444a2f8da704f (diff) | |
download | CMake-ea289314ef473d6bcdc1ca858aac6cdb15ecf56a.zip CMake-ea289314ef473d6bcdc1ca858aac6cdb15ecf56a.tar.gz CMake-ea289314ef473d6bcdc1ca858aac6cdb15ecf56a.tar.bz2 |
VS: Fix pre-VS15.8 unity build exclusion of per-config sources
In a unity build, the original source files need to be excluded from
the build. Prior to VS 15.8, this is done via `ExcludeFromBuild`,
which is the same mechanism used to implement per-config sources.
Fix a conflict in the implementation of the two features so that
unity-batched sources are excluded from all configurations rather
than just those in which they would otherwise have been included.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index a7822b2..cd4326f 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2351,7 +2351,7 @@ void cmVisualStudio10TargetGenerator::WriteAllSources(Elem& e0) // Visual Studio versions prior to 2017 15.8 do not know about unity // builds, thus we exclude the files already part of unity sources. if (!si.Source->GetPropertyAsBool("SKIP_UNITY_BUILD_INCLUSION")) { - exclude_configs = si.Configs; + exclude_configs = all_configs; } } } |