diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-05-09 13:33:52 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-05-09 13:33:52 (GMT) |
commit | 6734d3bb88d7d0706d0053380d70d368a9380cf0 (patch) | |
tree | b2dfcbc87c6304c2dec28e48712343d1a10ba35a /Source/cmTarget.h | |
parent | 1de2e698103e80864019a97106fe61b8501a201c (diff) | |
download | CMake-6734d3bb88d7d0706d0053380d70d368a9380cf0.zip CMake-6734d3bb88d7d0706d0053380d70d368a9380cf0.tar.gz CMake-6734d3bb88d7d0706d0053380d70d368a9380cf0.tar.bz2 |
ENH: change set<string> to set<cmStdString> to avoid long symbols that crash ar on solaris
Diffstat (limited to 'Source/cmTarget.h')
-rw-r--r-- | Source/cmTarget.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 37a2de5..a4e2ac5 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -113,7 +113,7 @@ public: */ void AddUtility(const char* u) { m_Utilities.insert(u);} ///! Get the utilities used by this target - std::set<std::string>const& GetUtilities() const { return m_Utilities; } + std::set<cmStdString>const& GetUtilities() const { return m_Utilities; } void AnalyzeLibDependencies( const cmMakefile& mf ); @@ -122,12 +122,12 @@ private: * This map holds the dependency graph. map[x] returns a set of * direct dependencies of x. */ - typedef std::map< std::string, std::set< std::string > > DependencyMap; + typedef std::map< cmStdString, std::set< cmStdString > > DependencyMap; /** * Maps a library name to its internal structure */ - typedef std::map< std::string, std::pair<std::string,LinkLibraryType> > LibTypeMap; + typedef std::map< cmStdString, std::pair<cmStdString,LinkLibraryType> > LibTypeMap; /** * Emits the library \param lib and all its dependencies into @@ -139,8 +139,8 @@ private: */ void Emit( const std::string& lib, const DependencyMap& dep_map, - std::set<std::string>& emitted, - std::set<std::string>& visited, + std::set<cmStdString>& emitted, + std::set<cmStdString>& visited, std::vector<std::string>& link_line ) const; /** @@ -161,7 +161,7 @@ private: */ bool DependsOn( const std::string& lib1, const std::string& lib2, const DependencyMap& dep_map, - std::set<std::string>& visited ) const; + std::set<cmStdString>& visited ) const; private: std::vector<cmCustomCommand> m_CustomCommands; @@ -169,11 +169,11 @@ private: TargetType m_TargetType; std::vector<cmSourceFile*> m_SourceFiles; LinkLibraries m_LinkLibraries; - std::set<std::string> m_PrevLinkedLibraries; + std::set<cmStdString> m_PrevLinkedLibraries; std::vector<std::string> m_LinkDirectories; bool m_InAll; std::string m_InstallPath; - std::set<std::string> m_Utilities; + std::set<cmStdString> m_Utilities; }; typedef std::map<cmStdString,cmTarget> cmTargets; |