diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-08 16:21:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-12-08 16:21:38 (GMT) |
| commit | fc9913075213e7636add2a811d41b6f3a7c37374 (patch) | |
| tree | dbf4f4a0e8c6844d5c2e4efbd3fc552263bb9f48 /Source/cmLocalGenerator.cxx | |
| parent | d71f69649f2085a67ecf27fed890de5a8f1f2362 (diff) | |
| parent | fa93b4a59bd639c995ffdf8a5c41dc587c160716 (diff) | |
| download | CMake-fc9913075213e7636add2a811d41b6f3a7c37374.zip CMake-fc9913075213e7636add2a811d41b6f3a7c37374.tar.gz CMake-fc9913075213e7636add2a811d41b6f3a7c37374.tar.bz2 | |
Merge branch 'backport-unity-object-libraries' into unity-object-libraries
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 7451ff3..50516e0 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2393,6 +2393,7 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) } const std::string buildType = cmSystemTools::UpperCase(config); + // FIXME: Refactor collection of sources to not evaluate object libraries. std::vector<cmSourceFile*> sources; target->GetSourceFiles(sources, buildType); @@ -2549,6 +2550,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target) cmStrCat(this->GetCurrentBinaryDirectory(), "/CMakeFiles/", target->GetName(), ".dir/Unity/"); + // FIXME: Refactor collection of sources to not evaluate object libraries. std::vector<cmSourceFile*> sources; target->GetSourceFiles(sources, buildType); @@ -2598,12 +2600,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target) for (; begin != end; ++begin) { cmSourceFile* sf = filtered_sources[begin]; - // Only in Visual Studio generator we keep the source files - // for explicit processing. - if (!this->GetGlobalGenerator()->IsMultiConfig() || - this->GetGlobalGenerator()->IsXcode()) { - target->AddSourceFileToUnityBatch(sf->ResolveFullPath()); - } + target->AddSourceFileToUnityBatch(sf->ResolveFullPath()); sf->SetProperty("UNITY_SOURCE_FILE", filename.c_str()); if (beforeInclude) { |