diff options
| author | Brad King <brad.king@kitware.com> | 2001-07-30 15:34:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-07-30 15:34:03 (GMT) |
| commit | ddec29c52d790333fd83b7826d807b73f4f1e36c (patch) | |
| tree | 1351c0489fcbb47a814d996a808b6360c7abfc37 /Source/cmMakeDepend.cxx | |
| parent | b24861d895f96040e35c94944cc3866e78e7781c (diff) | |
| download | CMake-ddec29c52d790333fd83b7826d807b73f4f1e36c.zip CMake-ddec29c52d790333fd83b7826d807b73f4f1e36c.tar.gz CMake-ddec29c52d790333fd83b7826d807b73f4f1e36c.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmMakeDepend.cxx')
| -rw-r--r-- | Source/cmMakeDepend.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx index 6416b98..5a18e07 100644 --- a/Source/cmMakeDepend.cxx +++ b/Source/cmMakeDepend.cxx @@ -90,9 +90,9 @@ void cmMakeDepend::SetMakefile(const cmMakefile* makefile) m_Makefile->m_ComplainFileRegularExpression.c_str()); // Now extract any include paths from the makefile flags - const std::set<std::string>& includes = + const std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories(); - for(std::set<std::string>::const_iterator j = includes.begin(); + for(std::vector<std::string>::const_iterator j = includes.begin(); j != includes.end(); ++j) { std::string path = *j; |