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

bug in not expanding variables for custom commands in targets

Browse Source
This commit is contained in:
Ken Martin 2003-06-20 13:56:51 -04:00
parent e9e312b441
commit 454c7ad2b6
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmMakefile.cxx
View File

@ -1173,6 +1173,7 @@ void cmMakefile::ExpandVariables()
void cmMakefile::ExpandVariablesInCustomCommands() void cmMakefile::ExpandVariablesInCustomCommands()
{ {
// do source files
for(std::vector<cmSourceFile*>::iterator i = m_SourceFiles.begin(); for(std::vector<cmSourceFile*>::iterator i = m_SourceFiles.begin();
i != m_SourceFiles.end(); ++i) i != m_SourceFiles.end(); ++i)
{ {
@ -1182,6 +1183,28 @@ void cmMakefile::ExpandVariablesInCustomCommands()
cc->ExpandVariables(*this); cc->ExpandVariables(*this);
} }
} }
// now do targets
std::vector<cmCustomCommand>::iterator ic;
for (cmTargets::iterator l = m_Targets.begin();
l != m_Targets.end(); l++)
{
for (ic = l->second.GetPreBuildCommands().begin();
ic != l->second.GetPreBuildCommands().end(); ++ic)
{
ic->ExpandVariables(*this);
}
for (ic = l->second.GetPreLinkCommands().begin();
ic != l->second.GetPreLinkCommands().end(); ++ic)
{
ic->ExpandVariables(*this);
}
for (ic = l->second.GetPostBuildCommands().begin();
ic != l->second.GetPostBuildCommands().end(); ++ic)
{
ic->ExpandVariables(*this);
}
}
} }
bool cmMakefile::IsOn(const char* name) const bool cmMakefile::IsOn(const char* name) const