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

Fix style errors added by parent and grandparent

This commit is contained in:
Brad King 2011-06-08 07:54:33 -04:00
parent eeeeca1082
commit f09ba0f1a2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2506,7 +2506,8 @@ cmXCodeObject* cmGlobalXCodeGenerator
} }
else else
{ {
std::vector<std::string> tgt_folders = cmSystemTools::tokenize(target, "/"); std::vector<std::string> tgt_folders =
cmSystemTools::tokenize(target, "/");
cmStdString curr_tgt_folder; cmStdString curr_tgt_folder;
for(std::vector<std::string>::size_type i = 0; i < tgt_folders.size();i++) for(std::vector<std::string>::size_type i = 0; i < tgt_folders.size();i++)
{ {
@ -2543,13 +2544,15 @@ cmXCodeObject* cmGlobalXCodeGenerator
//It's a recursive folder structure, let's find the real parent group //It's a recursive folder structure, let's find the real parent group
if(std::string(sg->GetFullName()) != std::string(sg->GetName())) if(std::string(sg->GetFullName()) != std::string(sg->GetName()))
{ {
std::vector<std::string> folders = cmSystemTools::tokenize(sg->GetFullName(), "\\"); std::vector<std::string> folders =
cmSystemTools::tokenize(sg->GetFullName(), "\\");
cmStdString curr_folder = cmtarget.GetName(); cmStdString curr_folder = cmtarget.GetName();
curr_folder += "/"; curr_folder += "/";
for(std::vector<std::string>::size_type i = 0; i < folders.size();i++) for(std::vector<std::string>::size_type i = 0; i < folders.size();i++)
{ {
curr_folder += folders[i]; curr_folder += folders[i];
std::map<cmStdString, cmXCodeObject* >::iterator i_folder = this->GroupNameMap.find(curr_folder); std::map<cmStdString, cmXCodeObject* >::iterator i_folder =
this->GroupNameMap.find(curr_folder);
//Create new folder //Create new folder
if(i_folder == this->GroupNameMap.end()) if(i_folder == this->GroupNameMap.end())
{ {

3
Source/cmSourceGroupCommand.cxx
View File

@ -27,7 +27,8 @@ bool cmSourceGroupCommand
delimiter = this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER"); delimiter = this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER");
} }
std::vector<std::string> folders = cmSystemTools::tokenize(args[0], delimiter); std::vector<std::string> folders =
cmSystemTools::tokenize(args[0], delimiter);
cmSourceGroup* sg = 0; cmSourceGroup* sg = 0;
sg = this->Makefile->GetSourceGroup(folders); sg = this->Makefile->GetSourceGroup(folders);