Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 12:16:40 +08:00
Code Issues Projects Releases Wiki Activity

export: Allow multiple exports when only one export is installed

Browse Source 
Since commit c8997fc046 (export: Allow depending on targets exported
multiple times, 2024-12-26, v4.0.0-rc1~241^2), it is possible to depend
on a target exported multiple times so long as the target is exported in
only one set and with a consistent namespace.  However, as a
side-effect, a target could not be in multiple export sets even if only
one of those sets was installed.

Update the check so that uninstalled export sets do not count towards a
target being exported multiple times.
This commit is contained in:
Martin Duffy
2025-03-17 17:07:17 -04:00
committed by Brad King
parent df2ec408c9
commit d723409e8e
3 changed files with 11 additions and 4 deletions
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) { [&name](std::unique_ptr<cmTargetExport> const& te) {
return te->TargetName == name; return te->TargetName == name;
})) { })) {
exportSets.insert(exp.first);
std::vector<cmInstallExportGenerator const*> const* installs = std::vector<cmInstallExportGenerator const*> const* installs =
exportSet.GetInstallations(); exportSet.GetInstallations();
for (cmInstallExportGenerator const* install : *installs) { if (!installs->empty()) {
exportFiles.push_back(install->GetDestinationFile()); exportSets.insert(exp.first);
namespaces.insert(install->GetNamespace()); for (cmInstallExportGenerator const* install : *installs) {
exportFiles.push_back(install->GetDestinationFile());
namespaces.insert(install->GetNamespace());
}
} }
} }
} }

4
Tests/RunCMake/PackageInfo/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/PackageInfo/RunCMakeTest.cmake
View File

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