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

install fixes for win32

Browse Source
This commit is contained in:
Ken Martin 2001-05-23 12:02:47 -04:00
parent 3ebfc32b5e
commit 1f6057e864
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmDSPMakefile.cxx
View File

@ -107,7 +107,10 @@ void cmDSPMakefile::OutputDSPFile()
this->SetBuildType(UTILITY, l->first.c_str()); this->SetBuildType(UTILITY, l->first.c_str());
break; break;
} }
this->CreateSingleDSP(l->first.c_str(),l->second); if (l->second.GetType() != cmTarget::INSTALL)
{
this->CreateSingleDSP(l->first.c_str(),l->second);
}
} }
} }

5
Source/cmDSPWriter.cxx
View File

@ -107,7 +107,10 @@ void cmDSPMakefile::OutputDSPFile()
this->SetBuildType(UTILITY, l->first.c_str()); this->SetBuildType(UTILITY, l->first.c_str());
break; break;
} }
this->CreateSingleDSP(l->first.c_str(),l->second); if (l->second.GetType() != cmTarget::INSTALL)
{
this->CreateSingleDSP(l->first.c_str(),l->second);
}
} }
} }

10
Source/cmDSWMakefile.cxx
View File

@ -125,7 +125,7 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout)
cmTargets &tgts = pg->GetDSPMakefile()->GetMakefile()->GetTargets(); cmTargets &tgts = pg->GetDSPMakefile()->GetMakefile()->GetTargets();
cmTargets::iterator l = tgts.begin(); cmTargets::iterator l = tgts.begin();
for(std::vector<std::string>::iterator si = dspnames.begin(); for(std::vector<std::string>::iterator si = dspnames.begin();
l != tgts.end(); ++l, ++si) l != tgts.end(); ++l)
{ {
// special handling for the current makefile // special handling for the current makefile
if(mf == m_Makefile) if(mf == m_Makefile)
@ -154,8 +154,12 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout)
} }
} }
// Write the project into the DSW file // Write the project into the DSW file
this->WriteProject(fout, si->c_str(), dir.c_str(), if (l->second.GetType() != cmTarget::INSTALL)
pg->GetDSPMakefile(),l->second); {
this->WriteProject(fout, si->c_str(), dir.c_str(),
pg->GetDSPMakefile(),l->second);
++si;
}
} }
// delete the cmMakefile which also deletes the cmMSProjectGenerator // delete the cmMakefile which also deletes the cmMSProjectGenerator
if(mf != m_Makefile) if(mf != m_Makefile)

10
Source/cmDSWWriter.cxx
View File

@ -125,7 +125,7 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout)
cmTargets &tgts = pg->GetDSPMakefile()->GetMakefile()->GetTargets(); cmTargets &tgts = pg->GetDSPMakefile()->GetMakefile()->GetTargets();
cmTargets::iterator l = tgts.begin(); cmTargets::iterator l = tgts.begin();
for(std::vector<std::string>::iterator si = dspnames.begin(); for(std::vector<std::string>::iterator si = dspnames.begin();
l != tgts.end(); ++l, ++si) l != tgts.end(); ++l)
{ {
// special handling for the current makefile // special handling for the current makefile
if(mf == m_Makefile) if(mf == m_Makefile)
@ -154,8 +154,12 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout)
} }
} }
// Write the project into the DSW file // Write the project into the DSW file
this->WriteProject(fout, si->c_str(), dir.c_str(), if (l->second.GetType() != cmTarget::INSTALL)
pg->GetDSPMakefile(),l->second); {
this->WriteProject(fout, si->c_str(), dir.c_str(),
pg->GetDSPMakefile(),l->second);
++si;
}
} }
// delete the cmMakefile which also deletes the cmMSProjectGenerator // delete the cmMakefile which also deletes the cmMSProjectGenerator
if(mf != m_Makefile) if(mf != m_Makefile)