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

STYLE: fix line length 

Alex
This commit is contained in:
Alexander Neundorf 2007-05-10 11:38:23 -04:00
parent 8c39efe854
commit 362f81981e
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalXCodeGenerator.cxx
View File

@ -959,7 +959,8 @@ void cmGlobalXCodeGenerator
std::vector<cmCustomCommand> std::vector<cmCustomCommand>
const & commands, const & commands,
const char* configName, const char* configName,
const std::map<cmStdString, cmStdString>& multipleOutputPairs const std::map<cmStdString,
cmStdString>& multipleOutputPairs
) )
{ {
std::string makefileName=makefileBasename; std::string makefileName=makefileBasename;
@ -1487,7 +1488,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
if(install_name_dir.find(".framework") != install_name_dir.npos) if(install_name_dir.find(".framework") != install_name_dir.npos)
{ {
install_name_dir = install_name_dir + "/.."; install_name_dir = install_name_dir + "/..";
install_name_dir = cmSystemTools::CollapseFullPath(install_name_dir.c_str()); install_name_dir =
cmSystemTools::CollapseFullPath(install_name_dir.c_str());
std::cerr << "new install name " << install_name_dir << "\n"; std::cerr << "new install name " << install_name_dir << "\n";
} }
} }

2
Source/cmGlobalXCodeGenerator.h
View File

@ -109,7 +109,7 @@ private:
void CreateCustomRulesMakefile(const char* makefileBasename, void CreateCustomRulesMakefile(const char* makefileBasename,
cmTarget& target, cmTarget& target,
std::vector<cmCustomCommand> const & commands, std::vector<cmCustomCommand> const & commands,
const char* configName, const char* configName,
const std::map<cmStdString, cmStdString>& const std::map<cmStdString, cmStdString>&
multipleOutputPairs multipleOutputPairs

3
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1283,7 +1283,8 @@ WriteCustomRule(std::ostream& fout,
{ {
// Write a rule for the output generated by this command. // Write a rule for the output generated by this command.
const char* sep = ""; const char* sep = "";
for(std::vector<std::string>::const_iterator o = command.GetOutputs().begin(); for(std::vector<std::string>::const_iterator o =
command.GetOutputs().begin();
o != command.GetOutputs().end(); o != command.GetOutputs().end();
++o) ++o)
{ {

6
Source/cmTarget.cxx
View File

@ -416,7 +416,7 @@ cmTarget::CheckForTargetsAsCommand(const std::vector<cmCustomCommand>& commands)
cli != commands.end(); cli != commands.end();
++cli ) ++cli )
{ {
for ( cmCustomCommandLines::const_iterator cit=cli->GetCommandLines().begin(); for(cmCustomCommandLines::const_iterator cit=cli->GetCommandLines().begin();
cit!=cli->GetCommandLines().end(); cit!=cli->GetCommandLines().end();
++cit ) ++cit )
{ {
@ -584,7 +584,9 @@ void cmTarget::TraceVSDependencies(std::string projFile,
outsf->GetCustomCommand()->AppendDepends(automaticTargetDepends); outsf->GetCustomCommand()->AppendDepends(automaticTargetDepends);
// add its dependencies to the list to check // add its dependencies to the list to check
for (unsigned int i = 0; i < outsf->GetCustomCommand()->GetDepends().size(); ++i) for (unsigned int i = 0;
i < outsf->GetCustomCommand()->GetDepends().size();
++i)
{ {
const std::string& fullName const std::string& fullName
= outsf->GetCustomCommand()->GetDepends()[i]; = outsf->GetCustomCommand()->GetDepends()[i];