diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-12-26 13:34:27 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-01-06 16:25:11 (GMT) |
| commit | 84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4 (patch) | |
| tree | 0d0d5b59269c8edc078450b8aeecc519affa6a2f /Source/cmGlobalGenerator.h | |
| parent | faedd2bea9c98fddd9e9f70deebdb53f8f369124 (diff) | |
| download | CMake-84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4.zip CMake-84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4.tar.gz CMake-84fac67f90b275116efa9ec25f5fcb2c2bf7f6b4.tar.bz2 | |
Don't allow include() of export(EXPORT) file at configure time.
As a new feature it does not need to participate in CMP0024.
Store cmExportBuildFileGenerator instances which correspond to the
export(EXPORT) signature in a second map which does not own the
pointers. This avoids the need to add cmExportBuildFileGenerator
and dependencies to the bootstrap system.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 049b0e6..fc5cab9 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -311,6 +311,7 @@ public: std::map<std::string, cmExportBuildFileGenerator*>& GetBuildExportSets() {return this->BuildExportSets;} void AddBuildExportSet(cmExportBuildFileGenerator*); + void AddBuildExportExportSet(cmExportBuildFileGenerator*); bool IsExportedTargetsFile(const std::string &filename) const; bool GenerateImportFile(const std::string &file); cmExportBuildFileGenerator* @@ -375,6 +376,7 @@ protected: // Sets of named target exports cmExportSetMap ExportSets; std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets; + std::map<std::string, cmExportBuildFileGenerator*> BuildExportExportSets; // Manifest of all targets that will be built for each configuration. // This is computed just before local generators generate. |