diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-04-21 21:54:10 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-04-21 21:54:10 (GMT) |
| commit | 6918844bd6c1e5e5146b33076ec64db91a201343 (patch) | |
| tree | c9a86f6ce8ce49f2df42ebf766cbf78abfa67b10 | |
| parent | 5473791b4b8c05ad1117377360f20d852325f194 (diff) | |
| download | CMake-6918844bd6c1e5e5146b33076ec64db91a201343.zip CMake-6918844bd6c1e5e5146b33076ec64db91a201343.tar.gz CMake-6918844bd6c1e5e5146b33076ec64db91a201343.tar.bz2 | |
ERR: Fix install on VS71
| -rw-r--r-- | Source/cmGlobalVisualStudio71Generator.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 8ddb74e..11d6cd7 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -52,12 +52,13 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout, homedir += "/"; bool doneAllBuild = false; bool doneRunTests = false; + bool doneInstall = false; // For each cmMakefile, create a VCProj for it, and // add it to this SLN file unsigned int i; for(i = 0; i < generators.size(); ++i) - { + { if(this->IsExcluded(root, generators[i])) { continue; @@ -132,7 +133,7 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout, { if ((l->second.GetType() != cmTarget::INSTALL_FILES) && (l->second.GetType() != cmTarget::INSTALL_PROGRAMS)) - { + { bool skip = false; if(l->first == "ALL_BUILD" ) { @@ -145,6 +146,17 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout, doneAllBuild = true; } } + if(l->first == "INSTALL") + { + if(doneInstall) + { + skip = true; + } + else + { + doneInstall = true; + } + } if(l->first == "RUN_TESTS") { if(doneRunTests) @@ -160,7 +172,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout, { this->WriteProject(fout, si->c_str(), dir.c_str(),l->second); } - ++si; } } |