BUG: Changed include and link directory paths in cmMakefile back to std::vector because there is an order dependency. Only cmMakefile::AddIncludeDirectory and cmMakefile::AddLinkDirectory should be called to add directories to the paths. They make sure the paths are unique as they are inserted.

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx
index 626a213..eff7bf1 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::set<std::string>& includes = m_Makefile->GetIncludeDirectories();
-  std::set<std::string>::iterator i;
+  std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories();
+  std::vector<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::set<std::string>::iterator i;
-  std::set<std::string>& libdirs = m_Makefile->GetLinkDirectories();
+  std::vector<std::string>::iterator i;
+  std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories();
   for(i = libdirs.begin(); i != libdirs.end(); ++i)
     {
     libOptions += " /LIBPATH:\"";