duh
This commit is contained in:
parent
521e301116
commit
012603c746
|
@ -62,26 +62,9 @@ void cmTarget::GenerateSourceFilesFromSourceLists(const cmMakefile &mf)
|
|||
const std::vector<cmSourceFile> &clsList =
|
||||
mf.GetSources().find(temps)->second;
|
||||
// if we ahave a limited build list, use it
|
||||
if (m_LimitedBuildList.empty())
|
||||
{
|
||||
m_SourceFiles.insert(m_SourceFiles.end(),
|
||||
clsList.begin(),
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
m_SourceFiles.insert(m_SourceFiles.end(),
|
||||
clsList.begin(),
|
||||
clsList.end());
|
||||
}
|
||||
// if one wasn't found then assume it is a single class
|
||||
else
|
||||
|
@ -89,19 +72,7 @@ void cmTarget::GenerateSourceFilesFromSourceLists(const cmMakefile &mf)
|
|||
cmSourceFile file;
|
||||
file.SetIsAnAbstractClass(false);
|
||||
file.SetName(temps.c_str(), mf.GetCurrentDirectory());
|
||||
if (m_LimitedBuildList.empty())
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
m_SourceFiles.push_back(file);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -86,13 +86,6 @@ public:
|
|||
{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
|
||||
*/
|
||||
|
@ -135,7 +128,6 @@ public:
|
|||
std::set<std::string>const& GetUtilities() const { return m_Utilities; }
|
||||
|
||||
private:
|
||||
std::vector<std::string> m_LimitedBuildList;
|
||||
std::vector<cmCustomCommand> m_CustomCommands;
|
||||
std::vector<std::string> m_SourceLists;
|
||||
TargetType m_TargetType;
|
||||
|
|
Loading…
Reference in New Issue