diff options
| author | Ken Martin <ken.martin@kitware.com> | 2001-05-23 16:02:47 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2001-05-23 16:02:47 (GMT) |
| commit | 1f6057e8646193895d353289b0ebf6fde29e1069 (patch) | |
| tree | 0fe600a705049b5150945608953d83a833953afb | |
| parent | 3ebfc32b5e7e7cd736d2ac27815db8d5fe098cfc (diff) | |
| download | CMake-1f6057e8646193895d353289b0ebf6fde29e1069.zip CMake-1f6057e8646193895d353289b0ebf6fde29e1069.tar.gz CMake-1f6057e8646193895d353289b0ebf6fde29e1069.tar.bz2 | |
install fixes for win32
| -rw-r--r-- | Source/cmDSPMakefile.cxx | 5 | ||||
| -rw-r--r-- | Source/cmDSPWriter.cxx | 5 | ||||
| -rw-r--r-- | Source/cmDSWMakefile.cxx | 10 | ||||
| -rw-r--r-- | Source/cmDSWWriter.cxx | 10 |
4 files changed, 22 insertions, 8 deletions
diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx index 8aa412d..9af272e 100644 --- a/Source/cmDSPMakefile.cxx +++ b/Source/cmDSPMakefile.cxx @@ -107,7 +107,10 @@ void cmDSPMakefile::OutputDSPFile() this->SetBuildType(UTILITY, l->first.c_str()); break; } - this->CreateSingleDSP(l->first.c_str(),l->second); + if (l->second.GetType() != cmTarget::INSTALL) + { + this->CreateSingleDSP(l->first.c_str(),l->second); + } } } diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index 8aa412d..9af272e 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -107,7 +107,10 @@ void cmDSPMakefile::OutputDSPFile() this->SetBuildType(UTILITY, l->first.c_str()); break; } - this->CreateSingleDSP(l->first.c_str(),l->second); + if (l->second.GetType() != cmTarget::INSTALL) + { + this->CreateSingleDSP(l->first.c_str(),l->second); + } } } diff --git a/Source/cmDSWMakefile.cxx b/Source/cmDSWMakefile.cxx index f377780..cd3feb7 100644 --- a/Source/cmDSWMakefile.cxx +++ b/Source/cmDSWMakefile.cxx @@ -125,7 +125,7 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout) cmTargets &tgts = pg->GetDSPMakefile()->GetMakefile()->GetTargets(); cmTargets::iterator l = tgts.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 if(mf == m_Makefile) @@ -154,8 +154,12 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout) } } // Write the project into the DSW file - this->WriteProject(fout, si->c_str(), dir.c_str(), - pg->GetDSPMakefile(),l->second); + if (l->second.GetType() != cmTarget::INSTALL) + { + this->WriteProject(fout, si->c_str(), dir.c_str(), + pg->GetDSPMakefile(),l->second); + ++si; + } } // delete the cmMakefile which also deletes the cmMSProjectGenerator if(mf != m_Makefile) diff --git a/Source/cmDSWWriter.cxx b/Source/cmDSWWriter.cxx index f377780..cd3feb7 100644 --- a/Source/cmDSWWriter.cxx +++ b/Source/cmDSWWriter.cxx @@ -125,7 +125,7 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout) cmTargets &tgts = pg->GetDSPMakefile()->GetMakefile()->GetTargets(); cmTargets::iterator l = tgts.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 if(mf == m_Makefile) @@ -154,8 +154,12 @@ void cmDSWMakefile::WriteDSWFile(std::ostream& fout) } } // Write the project into the DSW file - this->WriteProject(fout, si->c_str(), dir.c_str(), - pg->GetDSPMakefile(),l->second); + if (l->second.GetType() != cmTarget::INSTALL) + { + this->WriteProject(fout, si->c_str(), dir.c_str(), + pg->GetDSPMakefile(),l->second); + ++si; + } } // delete the cmMakefile which also deletes the cmMSProjectGenerator if(mf != m_Makefile) |