summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2022-06-28 18:15:19 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2022-06-29 19:05:32 (GMT)
commit3fee5398bd381e3721972220a8415b62bc96b172 (patch)
treef21184e4b70cc267d07ada41c5c64704fe344d8d /Source
parenta8bd06dfd47a56e09e660de5e58f26579105d2d4 (diff)
downloadCMake-3fee5398bd381e3721972220a8415b62bc96b172.zip
CMake-3fee5398bd381e3721972220a8415b62bc96b172.tar.gz
CMake-3fee5398bd381e3721972220a8415b62bc96b172.tar.bz2
install(EXPORT): Check for missing file sets at generate time
Missing file sets were originally checked at configure time in install(TARGETS ... EXPORT), but were not checked at generate time. If a file set was added after install(TARGETS ... EXPORT) was called, an abortion error was thrown. Check again at generate time to gracefully display an error message instead of crashing. Fixes: #23680
Diffstat (limited to 'Source')
-rw-r--r--Source/cmExportSet.cxx31
-rw-r--r--Source/cmExportSet.h2
-rw-r--r--Source/cmInstallExportGenerator.cxx3
3 files changed, 32 insertions, 4 deletions
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index a20aa9a..3d4ef0a 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -2,10 +2,15 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmExportSet.h"
+#include <algorithm>
#include <tuple>
#include <utility>
+#include "cmGeneratorTarget.h"
#include "cmLocalGenerator.h"
+#include "cmMessageType.h"
+#include "cmStringAlgorithms.h"
+#include "cmTarget.h"
#include "cmTargetExport.h"
cmExportSet::cmExportSet(std::string name)
@@ -15,11 +20,35 @@ cmExportSet::cmExportSet(std::string name)
cmExportSet::~cmExportSet() = default;
-void cmExportSet::Compute(cmLocalGenerator* lg)
+bool cmExportSet::Compute(cmLocalGenerator* lg)
{
for (std::unique_ptr<cmTargetExport>& tgtExport : this->TargetExports) {
tgtExport->Target = lg->FindGeneratorTargetToUse(tgtExport->TargetName);
+
+ auto const interfaceFileSets =
+ tgtExport->Target->Target->GetAllInterfaceFileSets();
+ auto const fileSetInTargetExport =
+ [&tgtExport, lg](const std::string& fileSetName) -> bool {
+ auto* fileSet = tgtExport->Target->Target->GetFileSet(fileSetName);
+
+ if (!tgtExport->FileSetGenerators.count(fileSet)) {
+ lg->IssueMessage(MessageType::FATAL_ERROR,
+ cmStrCat("File set \"", fileSetName,
+ "\" is listed in interface file sets of ",
+ tgtExport->Target->GetName(),
+ " but has not been exported"));
+ return false;
+ }
+ return true;
+ };
+
+ if (!std::all_of(interfaceFileSets.begin(), interfaceFileSets.end(),
+ fileSetInTargetExport)) {
+ return false;
+ }
}
+
+ return true;
}
void cmExportSet::AddTargetExport(std::unique_ptr<cmTargetExport> te)
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index 07deb11..b75a26d 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -25,7 +25,7 @@ public:
cmExportSet(const cmExportSet&) = delete;
cmExportSet& operator=(const cmExportSet&) = delete;
- void Compute(cmLocalGenerator* lg);
+ bool Compute(cmLocalGenerator* lg);
void AddTargetExport(std::unique_ptr<cmTargetExport> tgt);
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 820f24a..9cb376d 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -49,8 +49,7 @@ cmInstallExportGenerator::~cmInstallExportGenerator() = default;
bool cmInstallExportGenerator::Compute(cmLocalGenerator* lg)
{
this->LocalGenerator = lg;
- this->ExportSet->Compute(lg);
- return true;
+ return this->ExportSet->Compute(lg);
}
void cmInstallExportGenerator::ComputeTempDir()