echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'backport-3.16-pch-fix-bad-ClearSourcesCache'

Browse Source
This commit is contained in:
Brad King 2020-05-29 06:12:17 -04:00
commit 902858367f
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGeneratorTarget.cxx
View File

@ -3555,8 +3555,6 @@ std::string cmGeneratorTarget::GetPchFileObject(const std::string& config,
} }
std::string& filename = inserted.first->second; std::string& filename = inserted.first->second;
this->AddSource(pchSource, true);
auto pchSf = this->Makefile->GetOrCreateSource( auto pchSf = this->Makefile->GetOrCreateSource(
pchSource, false, cmSourceFileLocationKind::Known); pchSource, false, cmSourceFileLocationKind::Known);

16
Source/cmGlobalGenerator.cxx
View File

@ -1609,9 +1609,25 @@ bool cmGlobalGenerator::AddAutomaticSources()
continue; continue;
} }
lg->AddUnityBuild(gt.get()); lg->AddUnityBuild(gt.get());
// Targets that re-use a PCH are handled below.
if (!gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) {
lg->AddPchDependencies(gt.get()); lg->AddPchDependencies(gt.get());
} }
} }
}
for (const auto& lg : this->LocalGenerators) {
for (const auto& gt : lg->GetGeneratorTargets()) {
if (gt->GetType() == cmStateEnums::INTERFACE_LIBRARY ||
gt->GetType() == cmStateEnums::UTILITY ||
gt->GetType() == cmStateEnums::GLOBAL_TARGET) {
continue;
}
// Handle targets that re-use a PCH from an above-handled target.
if (gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) {
lg->AddPchDependencies(gt.get());
}
}
}
// The above transformations may have changed the classification of sources. // The above transformations may have changed the classification of sources.
// Clear the source list and classification cache (KindedSources) of all // Clear the source list and classification cache (KindedSources) of all
// targets so that it will be recomputed correctly by the generators later // targets so that it will be recomputed correctly by the generators later

7
Tests/RunCMake/PrecompileHeaders/PchReuseFrom.cmake
View File

@ -5,6 +5,11 @@ if(CMAKE_C_COMPILE_OPTIONS_USE_PCH)
add_definitions(-DHAVE_PCH_SUPPORT) add_definitions(-DHAVE_PCH_SUPPORT)
endif() endif()
# Add this before the target from which we will reuse the PCH
# to test that generators can handle reversed ordering.
add_library(foo foo.c)
target_include_directories(foo PUBLIC include)
add_library(empty empty.c) add_library(empty empty.c)
target_precompile_headers(empty PRIVATE target_precompile_headers(empty PRIVATE
<stdio.h> <stdio.h>
@ -12,8 +17,6 @@ target_precompile_headers(empty PRIVATE
) )
target_include_directories(empty PUBLIC include) target_include_directories(empty PUBLIC include)
add_library(foo foo.c)
target_include_directories(foo PUBLIC include)
target_precompile_headers(foo REUSE_FROM empty) target_precompile_headers(foo REUSE_FROM empty)
# should not cause problems if configured multiple times # should not cause problems if configured multiple times