diff options
| author | Amitha Perera <perera@cs.rpi.edu> | 2002-05-01 18:00:21 (GMT) |
|---|---|---|
| committer | Amitha Perera <perera@cs.rpi.edu> | 2002-05-01 18:00:21 (GMT) |
| commit | 1f8df8585ef36aa980d13a0cb6646de399bceff9 (patch) | |
| tree | 3106ab0d6e942aa15c783425316235c75c790e8b /Source/cmUnixMakefileGenerator.cxx | |
| parent | d53458de9ac298344a87d6703de78991d6770832 (diff) | |
| download | CMake-1f8df8585ef36aa980d13a0cb6646de399bceff9.zip CMake-1f8df8585ef36aa980d13a0cb6646de399bceff9.tar.gz CMake-1f8df8585ef36aa980d13a0cb6646de399bceff9.tar.bz2 | |
ENH: Add library dependency analysis.
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 125f5c1..9a31a20 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -480,8 +480,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(); + const std::vector<std::string>& libdirs = tgt.GetLinkDirectories(); + for(std::vector<std::string>::const_iterator libDir = libdirs.begin(); libDir != libdirs.end(); ++libDir) { std::string libpath = this->ConvertToOutputPath(libDir->c_str()); @@ -564,11 +564,6 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, linkLibs += librariesLinked; - if(!targetLibrary) - { - // For executables, add these a second time so order does not matter - linkLibs += librariesLinked; - } fout << linkLibs; if(outputRuntime && runtimeDirs.size()>0) |