diff options
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 5a93a38..2599068 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -65,7 +65,7 @@ void cmUnixMakefileGenerator::GenerateMakefile() m_LibraryOutputPath += "/"; } cmSystemTools::MakeDirectory(m_LibraryOutputPath.c_str()); - m_Makefile->GetLinkDirectories().push_back(m_LibraryOutputPath); + m_Makefile->GetLinkDirectories().insert(m_LibraryOutputPath); } if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH")) { @@ -76,7 +76,7 @@ void cmUnixMakefileGenerator::GenerateMakefile() m_ExecutableOutputPath += "/"; } cmSystemTools::MakeDirectory(m_ExecutableOutputPath.c_str()); - m_Makefile->GetLinkDirectories().push_back(m_ExecutableOutputPath); + m_Makefile->GetLinkDirectories().insert(m_ExecutableOutputPath); } if(m_CacheOnly) @@ -362,8 +362,8 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, // collect all the flags needed for linking libraries std::string linkLibs; - std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories(); - for(std::vector<std::string>::iterator libDir = libdirs.begin(); + std::set<std::string>& libdirs = m_Makefile->GetLinkDirectories(); + for(std::set<std::string>::iterator libDir = libdirs.begin(); libDir != libdirs.end(); ++libDir) { std::string libpath = cmSystemTools::EscapeSpaces(libDir->c_str()); @@ -653,8 +653,8 @@ void cmUnixMakefileGenerator::OutputMakeFlags(std::ostream& fout) { // Output Include paths fout << "INCLUDE_FLAGS = "; - 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; fout << "-I" << m_Makefile->GetStartDirectory() << " "; for(i = includes.begin(); i != includes.end(); ++i) { |