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

cmLocalUnixMakefileGenerator3: Port API to cmGenertorTarget.

This commit is contained in:
Stephen Kelly 2015-10-15 00:11:21 +02:00
parent 088fcbf733
commit 9f299a1225
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -209,7 +209,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
} }
LocalObjectInfo& info = localObjectFiles[objectName]; LocalObjectInfo& info = localObjectFiles[objectName];
info.HasSourceExtension = hasSourceExtension; info.HasSourceExtension = hasSourceExtension;
info.push_back(LocalObjectEntry(gt->Target, sf->GetLanguage())); info.push_back(LocalObjectEntry(gt, sf->GetLanguage()));
} }
} }
} }
@ -389,7 +389,7 @@ cmLocalUnixMakefileGenerator3
t != info.end(); ++t) t != info.end(); ++t)
{ {
std::string tgtMakefileName = std::string tgtMakefileName =
this->GetRelativeTargetDirectory(*(t->Target)); this->GetRelativeTargetDirectory(*(t->Target->Target));
std::string targetName = tgtMakefileName; std::string targetName = tgtMakefileName;
tgtMakefileName += "/build.make"; tgtMakefileName += "/build.make";
targetName += "/"; targetName += "/";

4
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -254,10 +254,10 @@ private:
struct LocalObjectEntry struct LocalObjectEntry
{ {
cmTarget* Target; cmGeneratorTarget* Target;
std::string Language; std::string Language;
LocalObjectEntry(): Target(0), Language() {} LocalObjectEntry(): Target(0), Language() {}
LocalObjectEntry(cmTarget* t, const std::string& lang): LocalObjectEntry(cmGeneratorTarget* t, const std::string& lang):
Target(t), Language(lang) {} Target(t), Language(lang) {}
}; };
struct LocalObjectInfo: public std::vector<LocalObjectEntry> struct LocalObjectInfo: public std::vector<LocalObjectEntry>