summaryrefslogtreecommitdiffstats
path: root/Source/cmDSPWriter.cxx
diff options
context:
space:
mode:
authorIan Scott <ian.m.scott@stud.man.ac.uk>2001-07-30 11:18:38 (GMT)
committerIan Scott <ian.m.scott@stud.man.ac.uk>2001-07-30 11:18:38 (GMT)
commitb24861d895f96040e35c94944cc3866e78e7781c (patch)
tree1b16733e3f9ebff6730d7bf5fba3a0ae40f7cc04 /Source/cmDSPWriter.cxx
parent8bad4180c7908426b50809f5ba5948e408330cee (diff)
downloadCMake-b24861d895f96040e35c94944cc3866e78e7781c.zip
CMake-b24861d895f96040e35c94944cc3866e78e7781c.tar.gz
CMake-b24861d895f96040e35c94944cc3866e78e7781c.tar.bz2
Removed the Uniquification of the include and link directory list in FinalPass,
and achieved the same effect by makein m_LinkDirectores and m_IncludeDirectories a set rather than vector
Diffstat (limited to 'Source/cmDSPWriter.cxx')
-rw-r--r--Source/cmDSPWriter.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx
index eff7bf1..626a213 100644
--- a/Source/cmDSPWriter.cxx
+++ b/Source/cmDSPWriter.cxx
@@ -68,8 +68,8 @@ void cmDSPWriter::OutputDSPFile()
}
// Setup /I and /LIBPATH options for the resulting DSP file
- std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories();
- std::vector<std::string>::iterator i;
+ std::set<std::string>& includes = m_Makefile->GetIncludeDirectories();
+ std::set<std::string>::iterator i;
for(i = includes.begin(); i != includes.end(); ++i)
{
m_IncludeOptions += "/I \"";
@@ -504,8 +504,8 @@ void cmDSPWriter::WriteDSPHeader(std::ostream& fout, const char *libName,
libMultiLineOptions += exePath;
libMultiLineOptions += "\" \n";
}
- std::vector<std::string>::iterator i;
- std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories();
+ std::set<std::string>::iterator i;
+ std::set<std::string>& libdirs = m_Makefile->GetLinkDirectories();
for(i = libdirs.begin(); i != libdirs.end(); ++i)
{
libOptions += " /LIBPATH:\"";