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

ENH: Dependency lists are now split into multiple make lines to allow longer lists on limited make programs.

Browse Source
This commit is contained in:
Brad King 2003-08-01 15:33:59 -04:00
parent f5559b0ec8
commit 8daa162753
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -2264,7 +2264,7 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
" $(TARGETS) $(GENERATED_QT_FILES) $(GENERATED_FLTK_FILES)"); " $(TARGETS) $(GENERATED_QT_FILES) $(GENERATED_FLTK_FILES)");
// collect up all the sources // collect up all the sources
std::string allsources; std::vector<std::string> allsources;
std::map<cmStdString, cmTarget>& targets = m_Makefile->GetTargets(); std::map<cmStdString, cmTarget>& targets = m_Makefile->GetTargets();
for(std::map<cmStdString,cmTarget>::const_iterator target = targets.begin(); for(std::map<cmStdString,cmTarget>::const_iterator target = targets.begin();
target != targets.end(); ++target) target != targets.end(); ++target)
@ -2276,8 +2276,7 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
{ {
if(!(*source)->GetPropertyAsBool("HEADER_FILE_ONLY")) if(!(*source)->GetPropertyAsBool("HEADER_FILE_ONLY"))
{ {
allsources += " \\\n"; allsources.push_back(cmSystemTools::ConvertToOutputPath((*source)->GetFullPath().c_str()));
allsources += cmSystemTools::ConvertToOutputPath((*source)->GetFullPath().c_str());
} }
} }
} }
@ -2290,14 +2289,15 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"-S$(CMAKE_CURRENT_SOURCE) -O$(CMAKE_CURRENT_BINARY) " "-S$(CMAKE_CURRENT_SOURCE) -O$(CMAKE_CURRENT_BINARY) "
"-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)" "-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)"
); );
std::vector<std::string> commands;
commands.push_back("$(CMAKE_COMMAND) "
"-S$(CMAKE_CURRENT_SOURCE) -O$(CMAKE_CURRENT_BINARY) "
"-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)");
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
"dependencies", "dependencies",
"cmake.check_depends", "cmake.check_depends",
allsources.c_str(), allsources,
"$(CMAKE_COMMAND) " commands);
"-S$(CMAKE_CURRENT_SOURCE) -O$(CMAKE_CURRENT_BINARY) "
"-H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)"
);
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
"dependencies", "dependencies",
@ -2719,16 +2719,36 @@ void cmLocalUnixMakefileGenerator::OutputMakeRule(std::ostream& fout,
replace = target; replace = target;
m_Makefile->ExpandVariablesInString(replace); m_Makefile->ExpandVariablesInString(replace);
fout << cmSystemTools::ConvertToOutputPath(replace.c_str()) << ":";
if(depends.size() > 1)
for(std::vector<std::string>::const_iterator dep = depends.begin();
dep != depends.end(); ++dep)
{ {
replace = *dep; // Create a proxy target collecting all the dependencies. This
m_Makefile->ExpandVariablesInString(replace); // allows for very long dependency lists.
fout << " " << replace.c_str(); std::string tgt = cmSystemTools::ConvertToOutputPath(replace.c_str());
for(std::vector<std::string>::const_iterator dep = depends.begin();
dep != depends.end(); ++dep)
{
replace = *dep;
m_Makefile->ExpandVariablesInString(replace);
fout << tgt.c_str() << ".dependency_list:: " << replace.c_str() << "\n";
}
// Forward dependencies through the proxy target.
fout << tgt.c_str() << ": " << tgt.c_str() << ".dependency_list\n";
}
else
{
fout << cmSystemTools::ConvertToOutputPath(replace.c_str()) << ":";
for(std::vector<std::string>::const_iterator dep = depends.begin();
dep != depends.end(); ++dep)
{
replace = *dep;
m_Makefile->ExpandVariablesInString(replace);
fout << " " << replace.c_str();
}
fout << "\n";
} }
fout << "\n";
int count = 0; int count = 0;
for (std::vector<std::string>::const_iterator i = commands.begin(); for (std::vector<std::string>::const_iterator i = commands.begin();
i != commands.end(); ++i) i != commands.end(); ++i)