diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-14 22:11:21 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-14 22:11:21 (GMT) |
| commit | 9f299a1225798f6485ab77c9140bf9c1d589e2fe (patch) | |
| tree | 7f841300749b0b3aeb0e838b2bb5589f0d1a27fa | |
| parent | 088fcbf733a7d1968fc3586a7077f22cb41e1917 (diff) | |
| download | CMake-9f299a1225798f6485ab77c9140bf9c1d589e2fe.zip CMake-9f299a1225798f6485ab77c9140bf9c1d589e2fe.tar.gz CMake-9f299a1225798f6485ab77c9140bf9c1d589e2fe.tar.bz2 | |
cmLocalUnixMakefileGenerator3: Port API to cmGenertorTarget.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 91c7acd..c08ea8a 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -209,7 +209,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles) } LocalObjectInfo& info = localObjectFiles[objectName]; 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) { std::string tgtMakefileName = - this->GetRelativeTargetDirectory(*(t->Target)); + this->GetRelativeTargetDirectory(*(t->Target->Target)); std::string targetName = tgtMakefileName; tgtMakefileName += "/build.make"; targetName += "/"; diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 98f15e6..82dedbd 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -254,10 +254,10 @@ private: struct LocalObjectEntry { - cmTarget* Target; + cmGeneratorTarget* Target; std::string Language; LocalObjectEntry(): Target(0), Language() {} - LocalObjectEntry(cmTarget* t, const std::string& lang): + LocalObjectEntry(cmGeneratorTarget* t, const std::string& lang): Target(t), Language(lang) {} }; struct LocalObjectInfo: public std::vector<LocalObjectEntry> |