kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: fix compile issue on Sun

This commit is contained in:
Ken Martin 2006-11-29 15:45:49 -05:00
parent 965a1475b6
commit d6219588c0
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -911,8 +911,10 @@ void cmMakefile::RemoveDefineFlag(const char* flag)
void cmMakefile::AddLinkLibrary(const char* lib,
cmTarget::LinkLibraryType llt)
{
this->LinkLibraries.push_back(
std::pair<std::string, cmTarget::LinkLibraryType>(lib,llt));
std::pair<std::string, cmTarget::LinkLibraryType> tmp;
tmp.first = lib;
tmp.second = llt;
this->LinkLibraries.push_back(tmp);
}
void cmMakefile::AddLinkLibraryForTarget(const char *target,

12
Source/cmTarget.cxx
View File

@ -464,8 +464,10 @@ void cmTarget::AddLinkLibrary(const std::string& lib,
LinkLibraryType llt)
{
this->AddFramework(lib.c_str(), llt);
this->LinkLibraries.push_back( std::pair<std::string,
cmTarget::LinkLibraryType>(lib,llt) );
std::pair<std::string, cmTarget::LinkLibraryType> tmp;
tmp.first = lib;
tmp.second = llt;
this->LinkLibraries.push_back(tmp);
}
bool cmTarget::AddFramework(const std::string& libname, LinkLibraryType llt)
@ -497,8 +499,10 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
return;
}
this->AddFramework(lib, llt);
this->LinkLibraries.push_back( std::pair<std::string,
cmTarget::LinkLibraryType>(lib,llt) );
std::pair<std::string, cmTarget::LinkLibraryType> tmp;
tmp.first = lib;
tmp.second = llt;
this->LinkLibraries.push_back( tmp );
// Add the explicit dependency information for this target. This is
// simply a set of libraries separated by ";". There should always