mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 14:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Unity: Generic source file handling for all generators

Browse Source
This commit is contained in:
Cristian Adam
2019-12-07 15:01:06 +01:00
parent f742f7ac1f
commit 5ae07e7166
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalGenerator.cxx
View File

@@ -2519,12 +2519,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target)
for (; begin != end; ++begin) { for (; begin != end; ++begin) {
cmSourceFile* sf = filtered_sources[begin]; cmSourceFile* sf = filtered_sources[begin];
// Only in Visual Studio generator we keep the source files target->AddSourceFileToUnityBatch(sf->ResolveFullPath());
// for explicit processing.
if (!this->GetGlobalGenerator()->IsMultiConfig() ||
this->GetGlobalGenerator()->IsXcode()) {
target->AddSourceFileToUnityBatch(sf->ResolveFullPath());
}
sf->SetProperty("UNITY_SOURCE_FILE", filename.c_str()); sf->SetProperty("UNITY_SOURCE_FILE", filename.c_str());
if (beforeInclude) { if (beforeInclude) {

2
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -2141,7 +2141,6 @@ void cmVisualStudio10TargetGenerator::WriteAllSources(Elem& e0)
this->WriteExtraSource(e1, si.Source); this->WriteExtraSource(e1, si.Source);
break; break;
case cmGeneratorTarget::SourceKindHeader: case cmGeneratorTarget::SourceKindHeader:
case cmGeneratorTarget::SourceKindUnityBatched:
this->WriteHeaderSource(e1, si.Source); this->WriteHeaderSource(e1, si.Source);
break; break;
case cmGeneratorTarget::SourceKindIDL: case cmGeneratorTarget::SourceKindIDL:
@@ -2153,6 +2152,7 @@ void cmVisualStudio10TargetGenerator::WriteAllSources(Elem& e0)
case cmGeneratorTarget::SourceKindModuleDefinition: case cmGeneratorTarget::SourceKindModuleDefinition:
tool = "None"; tool = "None";
break; break;
case cmGeneratorTarget::SourceKindUnityBatched:
case cmGeneratorTarget::SourceKindObjectSource: { case cmGeneratorTarget::SourceKindObjectSource: {
const std::string& lang = si.Source->GetLanguage(); const std::string& lang = si.Source->GetLanguage();
if (lang == "C" || lang == "CXX") { if (lang == "C" || lang == "CXX") {