parent
8c39efe854
commit
362f81981e
|
@ -959,7 +959,8 @@ void cmGlobalXCodeGenerator
|
|||
std::vector<cmCustomCommand>
|
||||
const & commands,
|
||||
const char* configName,
|
||||
const std::map<cmStdString, cmStdString>& multipleOutputPairs
|
||||
const std::map<cmStdString,
|
||||
cmStdString>& multipleOutputPairs
|
||||
)
|
||||
{
|
||||
std::string makefileName=makefileBasename;
|
||||
|
@ -1487,7 +1488,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
|
|||
if(install_name_dir.find(".framework") != install_name_dir.npos)
|
||||
{
|
||||
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";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1283,7 +1283,8 @@ WriteCustomRule(std::ostream& fout,
|
|||
{
|
||||
// Write a rule for the output generated by this command.
|
||||
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)
|
||||
{
|
||||
|
|
|
@ -416,7 +416,7 @@ cmTarget::CheckForTargetsAsCommand(const std::vector<cmCustomCommand>& commands)
|
|||
cli != commands.end();
|
||||
++cli )
|
||||
{
|
||||
for ( cmCustomCommandLines::const_iterator cit=cli->GetCommandLines().begin();
|
||||
for(cmCustomCommandLines::const_iterator cit=cli->GetCommandLines().begin();
|
||||
cit!=cli->GetCommandLines().end();
|
||||
++cit )
|
||||
{
|
||||
|
@ -584,7 +584,9 @@ void cmTarget::TraceVSDependencies(std::string projFile,
|
|||
outsf->GetCustomCommand()->AppendDepends(automaticTargetDepends);
|
||||
|
||||
// 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
|
||||
= outsf->GetCustomCommand()->GetDepends()[i];
|
||||
|
|
Loading…
Reference in New Issue