dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-06-24 16:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-4.2-find_package-stack' into find_package-stack

Browse Source
This commit is contained in:
Brad King
2026-04-01 13:52:04 -04:00
parent 9387988626 5aa649d5f6
commit a789c21100
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmMakefile.cxx
View File

@@ -4267,14 +4267,24 @@ cmFindPackageStackRAII::~cmFindPackageStackRAII()
this->Makefile->FindPackageStack = this->Makefile->FindPackageStack.Pop();
if (!this->Makefile->FindPackageStack.Empty()) {
auto top = this->Makefile->FindPackageStack.Top();
// We have just finished an inner package found as a dependency of an
// outer package. Targets created in the outer package after this
// point may depend on the inner package, so if they are exported,
// their find_dependency call for the outer package should be
// ordered after the find_dependency call for the inner package.
//
// Any targets created by the outer package before the inner package
// was loaded will have already saved a copy of the outer package
// stack with its original index. Replace the top entry with a new
// one representing the same outer package with a new index.
cmFindPackageCall outer = this->Makefile->FindPackageStack.Top();
this->Makefile->FindPackageStack = this->Makefile->FindPackageStack.Pop();
top.Index = this->Makefile->FindPackageStackNextIndex;
outer.Index = this->Makefile->FindPackageStackNextIndex;
this->Makefile->FindPackageStackNextIndex++;
this->Makefile->FindPackageStack =
this->Makefile->FindPackageStack.Push(top);
this->Makefile->FindPackageStack.Push(outer);
}
}