diff options
| author | Amitha Perera <perera@cs.rpi.edu> | 2002-05-02 17:41:40 (GMT) |
|---|---|---|
| committer | Amitha Perera <perera@cs.rpi.edu> | 2002-05-02 17:41:40 (GMT) |
| commit | 4fe8947bcc725396a6bb85720c6836d81d100dd7 (patch) | |
| tree | fe7d2ded8e16953035b07350dfca290805e84a92 /Source/cmTarget.h | |
| parent | 27fe57b716555ffa31b16e98841c7f1a82228740 (diff) | |
| download | CMake-4fe8947bcc725396a6bb85720c6836d81d100dd7.zip CMake-4fe8947bcc725396a6bb85720c6836d81d100dd7.tar.gz CMake-4fe8947bcc725396a6bb85720c6836d81d100dd7.tar.bz2 | |
BUG: The library paths should stay with the libraries during dependency analysis.
Diffstat (limited to 'Source/cmTarget.h')
| -rw-r--r-- | Source/cmTarget.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 124c04c..7aee9f6 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -121,6 +121,11 @@ private: typedef std::map< std::string, std::set< std::string > > DependencyMap; /** + * Maps a canonical library name to it's proper type + */ + typedef std::map< std::string, std::pair<std::string,LinkLibraryType> > LibTypeMap; + + /** * For each library in the link line, return a canonical name. The * orginal library names have complicated forms, such as "x", * "libx.so", "/full/path/libx.a", "-lx", and "-framework x". @@ -146,7 +151,8 @@ private: * specified, and inserts them into \param dep_map. */ void GatherDependencies( const cmMakefile& mf, const std::string& lib, - DependencyMap& dep_map ) const; + DependencyMap& dep_map, + LibTypeMap& lib_map ) const; /** * Returns true if lib1 depends on lib2 according to \param |