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

cmGeneratorTarget: Port internal type to cmGeneratorTarget.

This commit is contained in:
Stephen Kelly 2015-08-02 19:44:31 +02:00
parent 32f131b0ca
commit 193699376a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGeneratorTarget.cxx
View File

@ -36,7 +36,7 @@
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib, void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib,
cmTarget *target, cmake *cm) cmGeneratorTarget const* target, cmake *cm)
{ {
if(!badObjLib.empty()) if(!badObjLib.empty())
{ {
@ -50,7 +50,7 @@ void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib,
e << "but may contain only sources that compile, header files, and " e << "but may contain only sources that compile, header files, and "
"other files that would not affect linking of a normal library."; "other files that would not affect linking of a normal library.";
cm->IssueMessage(cmake::FATAL_ERROR, e.str(), cm->IssueMessage(cmake::FATAL_ERROR, e.str(),
target->GetBacktrace()); target->Target->GetBacktrace());
} }
} }
@ -133,14 +133,14 @@ struct TagVisitor
{ {
DataType& Data; DataType& Data;
std::vector<cmSourceFile*> BadObjLibFiles; std::vector<cmSourceFile*> BadObjLibFiles;
cmTarget *Target; cmGeneratorTarget const* Target;
cmGlobalGenerator *GlobalGenerator; cmGlobalGenerator *GlobalGenerator;
cmsys::RegularExpression Header; cmsys::RegularExpression Header;
bool IsObjLib; bool IsObjLib;
TagVisitor(cmTarget *target, DataType& data) TagVisitor(cmGeneratorTarget const* target, DataType& data)
: Data(data), Target(target), : Data(data), Target(target),
GlobalGenerator(target->GetMakefile()->GetGlobalGenerator()), GlobalGenerator(target->GetLocalGenerator()->GetGlobalGenerator()),
Header(CM_HEADER_REGEX), Header(CM_HEADER_REGEX),
IsObjLib(target->GetType() == cmTarget::OBJECT_LIBRARY) IsObjLib(target->GetType() == cmTarget::OBJECT_LIBRARY)
{ {
@ -362,7 +362,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt,
{ \ { \
std::vector<cmSourceFile*> sourceFiles; \ std::vector<cmSourceFile*> sourceFiles; \
this->Target->GetSourceFiles(sourceFiles, config); \ this->Target->GetSourceFiles(sourceFiles, config); \
TagVisitor<DATA ## Tag DATATYPE> visitor(this->Target, data); \ TagVisitor<DATA ## Tag DATATYPE> visitor(this, data); \
for(std::vector<cmSourceFile*>::const_iterator si = sourceFiles.begin(); \ for(std::vector<cmSourceFile*>::const_iterator si = sourceFiles.begin(); \
si != sourceFiles.end(); ++si) \ si != sourceFiles.end(); ++si) \
{ \ { \