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

ERR: Fix install on VS71

Browse Source
This commit is contained in:
Andy Cedilnik 2004-04-21 17:54:10 -04:00
parent 5473791b4b
commit 6918844bd6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -52,12 +52,13 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
homedir += "/"; homedir += "/";
bool doneAllBuild = false; bool doneAllBuild = false;
bool doneRunTests = false; bool doneRunTests = false;
bool doneInstall = false;
// For each cmMakefile, create a VCProj for it, and // For each cmMakefile, create a VCProj for it, and
// add it to this SLN file // add it to this SLN file
unsigned int i; unsigned int i;
for(i = 0; i < generators.size(); ++i) for(i = 0; i < generators.size(); ++i)
{ {
if(this->IsExcluded(root, generators[i])) if(this->IsExcluded(root, generators[i]))
{ {
continue; continue;
@ -132,7 +133,7 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
{ {
if ((l->second.GetType() != cmTarget::INSTALL_FILES) if ((l->second.GetType() != cmTarget::INSTALL_FILES)
&& (l->second.GetType() != cmTarget::INSTALL_PROGRAMS)) && (l->second.GetType() != cmTarget::INSTALL_PROGRAMS))
{ {
bool skip = false; bool skip = false;
if(l->first == "ALL_BUILD" ) if(l->first == "ALL_BUILD" )
{ {
@ -145,6 +146,17 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
doneAllBuild = true; doneAllBuild = true;
} }
} }
if(l->first == "INSTALL")
{
if(doneInstall)
{
skip = true;
}
else
{
doneInstall = true;
}
}
if(l->first == "RUN_TESTS") if(l->first == "RUN_TESTS")
{ {
if(doneRunTests) if(doneRunTests)
@ -160,7 +172,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
{ {
this->WriteProject(fout, si->c_str(), dir.c_str(),l->second); this->WriteProject(fout, si->c_str(), dir.c_str(),l->second);
} }
++si; ++si;
} }
} }