diff options
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 12 | ||||
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.h | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index a71b1cb..597c9d8 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -17,7 +17,6 @@ #include "cmake.h" #include "cmSourceFile.h" #include "cmGeneratedFileStream.h" -#include "cmTarget.h" #include "cmSystemTools.h" #include "cmXMLSafe.h" @@ -441,7 +440,7 @@ void cmExtraCodeBlocksGenerator } CbpUnit &cbpUnit = allFiles[fullPath]; - cbpUnit.Targets.push_back((*ti)->Target); + cbpUnit.Targets.push_back(*ti); } } default: // intended fallthrough @@ -501,8 +500,9 @@ void cmExtraCodeBlocksGenerator fout<<" <Unit filename=\""<< cmXMLSafe(unitFilename) <<"\">\n"; - for(std::vector<const cmTarget*>::const_iterator ti = unit.Targets.begin(); - ti != unit.Targets.end(); ++ti) + for(std::vector<const cmGeneratorTarget*>::const_iterator ti = + unit.Targets.begin(); + ti != unit.Targets.end(); ++ti) { std::string const& targetName = (*ti)->GetName(); fout<<" <Option target=\""<< cmXMLSafe(targetName) <<"\"/>\n"; @@ -560,7 +560,7 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, fout<<" <Target title=\"" << targetName << "\">\n"; if (target!=0) { - int cbTargetType = this->GetCBTargetType(target->Target); + int cbTargetType = this->GetCBTargetType(target); std::string workingDir = lg->GetCurrentBinaryDirectory(); if ( target->GetType()==cmState::EXECUTABLE) { @@ -718,7 +718,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf) // Translate the cmake target type into the CodeBlocks target type id -int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target) +int cmExtraCodeBlocksGenerator::GetCBTargetType(cmGeneratorTarget* target) { if ( target->GetType()==cmState::EXECUTABLE) { diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h index f28809a..0c3846d 100644 --- a/Source/cmExtraCodeBlocksGenerator.h +++ b/Source/cmExtraCodeBlocksGenerator.h @@ -18,7 +18,6 @@ class cmLocalGenerator; class cmMakefile; class cmGeneratorTarget; -class cmTarget; class cmGeneratedFileStream; /** \class cmExtraCodeBlocksGenerator @@ -42,7 +41,7 @@ public: private: struct CbpUnit { - std::vector<const cmTarget*> Targets; + std::vector<const cmGeneratorTarget*> Targets; }; void CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs); @@ -53,7 +52,7 @@ private: cmGeneratorTarget* target) const; std::string GetCBCompilerId(const cmMakefile* mf); - int GetCBTargetType(cmTarget* target); + int GetCBTargetType(cmGeneratorTarget* target); std::string BuildMakeCommand(const std::string& make, const char* makefile, const std::string& target); void AppendTarget(cmGeneratedFileStream& fout, |