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

a better fix maybe

This commit is contained in:
Ken Martin 2001-11-08 15:09:43 -05:00
parent 03fd2f6dfa
commit 05717b3dab
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmDSWWriter.cxx
View File

@ -162,10 +162,17 @@ void cmDSWWriter::WriteDSWFile(std::ostream& fout)
for(cmTargets::const_iterator al = atgts.begin(); for(cmTargets::const_iterator al = atgts.begin();
al != atgts.end(); ++al) al != atgts.end(); ++al)
{ {
if(al->second.IsInAll()) if (al->second.IsInAll())
{ {
l->second.GetLinkLibraries().push_back( if (al->second.GetType() == cmTarget::UTILITY)
cmTarget::LinkLibraries::value_type(al->first, cmTarget::GENERAL)); {
l->second.AddUtility(al->first.c_str());
}
else
{
l->second.GetLinkLibraries().push_back(
cmTarget::LinkLibraries::value_type(al->first, cmTarget::GENERAL));
}
} }
} }
} }
@ -234,7 +241,7 @@ void cmDSWWriter::WriteProject(std::ostream& fout,
// is the library part of this DSW ? If so add dependency // is the library part of this DSW ? If so add dependency
const char* cacheValue const char* cacheValue
= m_Makefile->GetDefinition(j->first.c_str()); = m_Makefile->GetDefinition(j->first.c_str());
if(cacheValue || (strcmp(dspname, "ALL_BUILD") == 0)) if(cacheValue)
{ {
fout << "Begin Project Dependency\n"; fout << "Begin Project Dependency\n";
fout << "Project_Dep_Name " << j->first << "\n"; fout << "Project_Dep_Name " << j->first << "\n";