duh
This commit is contained in:
parent
521e301116
commit
012603c746
|
@ -62,47 +62,18 @@ void cmTarget::GenerateSourceFilesFromSourceLists(const cmMakefile &mf)
|
||||||
const std::vector<cmSourceFile> &clsList =
|
const std::vector<cmSourceFile> &clsList =
|
||||||
mf.GetSources().find(temps)->second;
|
mf.GetSources().find(temps)->second;
|
||||||
// if we ahave a limited build list, use it
|
// if we ahave a limited build list, use it
|
||||||
if (m_LimitedBuildList.empty())
|
|
||||||
{
|
|
||||||
m_SourceFiles.insert(m_SourceFiles.end(),
|
m_SourceFiles.insert(m_SourceFiles.end(),
|
||||||
clsList.begin(),
|
clsList.begin(),
|
||||||
clsList.end());
|
clsList.end());
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
std::vector<cmSourceFile>::const_iterator si = clsList.begin();
|
|
||||||
for (; si != clsList.end(); ++si)
|
|
||||||
{
|
|
||||||
// is it on the approved list ?
|
|
||||||
if (std::find(m_LimitedBuildList.begin(),
|
|
||||||
m_LimitedBuildList.end(),
|
|
||||||
si->GetFullPath()) != m_LimitedBuildList.end())
|
|
||||||
{
|
|
||||||
m_SourceFiles.push_back(*si);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// if one wasn't found then assume it is a single class
|
// if one wasn't found then assume it is a single class
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cmSourceFile file;
|
cmSourceFile file;
|
||||||
file.SetIsAnAbstractClass(false);
|
file.SetIsAnAbstractClass(false);
|
||||||
file.SetName(temps.c_str(), mf.GetCurrentDirectory());
|
file.SetName(temps.c_str(), mf.GetCurrentDirectory());
|
||||||
if (m_LimitedBuildList.empty())
|
|
||||||
{
|
|
||||||
m_SourceFiles.push_back(file);
|
m_SourceFiles.push_back(file);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
if (std::find(m_LimitedBuildList.begin(),
|
|
||||||
m_LimitedBuildList.end(),
|
|
||||||
file.GetFullPath()) != m_LimitedBuildList.end())
|
|
||||||
{
|
|
||||||
m_SourceFiles.push_back(file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// expand any link library variables whle we are at it
|
// expand any link library variables whle we are at it
|
||||||
|
|
|
@ -86,13 +86,6 @@ public:
|
||||||
{return m_SourceLists;}
|
{return m_SourceLists;}
|
||||||
std::vector<std::string> &GetSourceLists() {return m_SourceLists;}
|
std::vector<std::string> &GetSourceLists() {return m_SourceLists;}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the list of the source lists used by this target
|
|
||||||
*/
|
|
||||||
const std::vector<std::string> &GetLimitedBuildList() const
|
|
||||||
{return m_LimitedBuildList;}
|
|
||||||
std::vector<std::string> &GetLimitedBuildList() {return m_LimitedBuildList;}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the list of the source files used by this target
|
* Get the list of the source files used by this target
|
||||||
*/
|
*/
|
||||||
|
@ -135,7 +128,6 @@ public:
|
||||||
std::set<std::string>const& GetUtilities() const { return m_Utilities; }
|
std::set<std::string>const& GetUtilities() const { return m_Utilities; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::vector<std::string> m_LimitedBuildList;
|
|
||||||
std::vector<cmCustomCommand> m_CustomCommands;
|
std::vector<cmCustomCommand> m_CustomCommands;
|
||||||
std::vector<std::string> m_SourceLists;
|
std::vector<std::string> m_SourceLists;
|
||||||
TargetType m_TargetType;
|
TargetType m_TargetType;
|
||||||
|
|
Loading…
Reference in New Issue