mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-23 14:48:19 -05:00
Merge topic 'export-multiple-set-not-installed' into release-4.0
d723409e8e export: Allow multiple exports when only one export is installed
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10489
This commit is contained in:
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
project(DependsMultipleNotInstalled CXX)
|
||||
set(NAMESPACE foo::)
|
||||
include(DependsMultipleCommon.cmake)
|
||||
install(TARGETS foo EXPORT foo-alt) # set foo-alt never installed
|
||||
@@ -34,3 +34,4 @@ run_cmake(LowerCaseFile)
|
||||
run_cmake(Requirements)
|
||||
run_cmake(TargetTypes)
|
||||
run_cmake(DependsMultiple)
|
||||
run_cmake(DependsMultipleNotInstalled)
|
||||
|
||||
Reference in New Issue
Block a user