summaryrefslogtreecommitdiffstats
path: root/Source/cmExportBuildFileGenerator.h
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2019-06-26 17:48:59 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2019-06-27 14:57:34 (GMT)
commit49cfd390075ba1f92aa96bbf3d3510a813e0b068 (patch)
treee09853d0405b4ee584a39f35ba3ee6b7c80d29c2 /Source/cmExportBuildFileGenerator.h
parent06f1560a58391d29b10697b2d5462966cd417b2f (diff)
downloadCMake-49cfd390075ba1f92aa96bbf3d3510a813e0b068.zip
CMake-49cfd390075ba1f92aa96bbf3d3510a813e0b068.tar.gz
CMake-49cfd390075ba1f92aa96bbf3d3510a813e0b068.tar.bz2
cmExportBuildFileGenerator: improve error message
When an exported target depends on another exported target that is included in multiple build export sets, the error message was woefully unhelpful. Now, include information about what build exports the dependent target was included in with instructions for fixing the problem that are actually helpful.
Diffstat (limited to 'Source/cmExportBuildFileGenerator.h')
-rw-r--r--Source/cmExportBuildFileGenerator.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h
index 0a1e755..e5b6597 100644
--- a/Source/cmExportBuildFileGenerator.h
+++ b/Source/cmExportBuildFileGenerator.h
@@ -11,6 +11,7 @@
#include <iosfwd>
#include <string>
+#include <utility>
#include <vector>
class cmExportSet;
@@ -64,7 +65,7 @@ protected:
void ComplainAboutMissingTarget(cmGeneratorTarget* depender,
cmGeneratorTarget* dependee,
- int occurrences);
+ std::vector<std::string> const& namespaces);
/** Fill in properties indicating built file locations. */
void SetImportLocationProperty(const std::string& config,
@@ -75,8 +76,8 @@ protected:
std::string InstallNameDir(cmGeneratorTarget* target,
const std::string& config) override;
- std::vector<std::string> FindNamespaces(cmGlobalGenerator* gg,
- const std::string& name);
+ std::pair<std::vector<std::string>, std::string> FindBuildExportInfo(
+ cmGlobalGenerator* gg, const std::string& name);
std::vector<std::string> Targets;
cmExportSet* ExportSet;