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

Merge branch 'backport-export-multiple-set-not-installed'

Browse Source
This commit is contained in:
Brad King 2025-03-17 18:04:53 -04:00
commit 953e5ec831
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmExportInstallFileGenerator.cxx
View File

@ -280,12 +280,14 @@ cmExportFileGenerator::ExportInfo cmExportInstallFileGenerator::FindExportInfo(
[&name](std::unique_ptr<cmTargetExport> const& te) {
return te->TargetName == name;
})) {
exportSets.insert(exp.first);
std::vector<cmInstallExportGenerator const*> const* installs =
exportSet.GetInstallations();
for (cmInstallExportGenerator const* install : *installs) {
exportFiles.push_back(install->GetDestinationFile());
namespaces.insert(install->GetNamespace());
if (!installs->empty()) {
exportSets.insert(exp.first);
for (cmInstallExportGenerator const* install : *installs) {
exportFiles.push_back(install->GetDestinationFile());
namespaces.insert(install->GetNamespace());
}
}
}
}

4
Tests/RunCMake/InstallPackageInfo/DependsMultipleNotInstalled.cmake Normal file
View File

@ -0,0 +1,4 @@
project(DependsMultipleNotInstalled CXX)
set(NAMESPACE foo::)
include(DependsMultipleCommon.cmake)
install(TARGETS foo EXPORT foo-alt) # set foo-alt never installed

1
Tests/RunCMake/InstallPackageInfo/RunCMakeTest.cmake
View File

@ -35,3 +35,4 @@ run_cmake(LowerCaseFile)
run_cmake(Requirements)
run_cmake(TargetTypes)
run_cmake(DependsMultiple)
run_cmake(DependsMultipleNotInstalled)