kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Remove the TargetManifest member.

This commit is contained in:
Stephen Kelly 2015-07-25 19:10:44 +02:00 committed by Brad King
parent 5c14f78005
commit 1ef9b2b600
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGeneratorTarget.cxx
View File

@ -1150,35 +1150,35 @@ void cmGeneratorTarget::GenerateTargetManifest(
f = dir; f = dir;
f += "/"; f += "/";
f += name; f += name;
gg->AddToManifest(config, f); gg->AddToManifest(f);
} }
if(!soName.empty()) if(!soName.empty())
{ {
f = dir; f = dir;
f += "/"; f += "/";
f += soName; f += soName;
gg->AddToManifest(config, f); gg->AddToManifest(f);
} }
if(!realName.empty()) if(!realName.empty())
{ {
f = dir; f = dir;
f += "/"; f += "/";
f += realName; f += realName;
gg->AddToManifest(config, f); gg->AddToManifest(f);
} }
if(!pdbName.empty()) if(!pdbName.empty())
{ {
f = dir; f = dir;
f += "/"; f += "/";
f += pdbName; f += pdbName;
gg->AddToManifest(config, f); gg->AddToManifest(f);
} }
if(!impName.empty()) if(!impName.empty())
{ {
f = this->Target->GetDirectory(config, true); f = this->Target->GetDirectory(config, true);
f += "/"; f += "/";
f += impName; f += impName;
gg->AddToManifest(config, f); gg->AddToManifest(f);
} }
} }

6
Source/cmGlobalGenerator.cxx
View File

@ -2698,12 +2698,8 @@ void cmGlobalGenerator::AddTargetDepends(cmGeneratorTarget const* target,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalGenerator::AddToManifest(const std::string& config, void cmGlobalGenerator::AddToManifest(std::string const& f)
std::string const& f)
{ {
// Add to the main manifest for this configuration.
this->TargetManifest[config].insert(f);
// Add to the content listing for the file's directory. // Add to the content listing for the file's directory.
std::string dir = cmSystemTools::GetFilenamePath(f); std::string dir = cmSystemTools::GetFilenamePath(f);
std::string file = cmSystemTools::GetFilenameName(f); std::string file = cmSystemTools::GetFilenameName(f);

6
Source/cmGlobalGenerator.h
View File

@ -200,7 +200,7 @@ public:
cmExportSetMap& GetExportSets() {return this->ExportSets;} cmExportSetMap& GetExportSets() {return this->ExportSets;}
/** Add a file to the manifest of generated targets for a configuration. */ /** Add a file to the manifest of generated targets for a configuration. */
void AddToManifest(const std::string& config, std::string const& f); void AddToManifest(std::string const& f);
void EnableInstallTarget(); void EnableInstallTarget();
@ -424,10 +424,6 @@ protected:
std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets; std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets;
std::map<std::string, cmExportBuildFileGenerator*> BuildExportExportSets; 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.
cmTargetManifest TargetManifest;
// All targets in the entire project. // All targets in the entire project.
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)
#ifdef CMake_HAVE_CXX11_UNORDERED_MAP #ifdef CMake_HAVE_CXX11_UNORDERED_MAP