diff options
| author | Ken Martin <ken.martin@kitware.com> | 2006-11-29 20:45:49 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2006-11-29 20:45:49 (GMT) |
| commit | d6219588c049c8d7ca1b328d918e410e9385f0c8 (patch) | |
| tree | 2265c937fa2497e1c7aee4fbd942da0bf8108850 | |
| parent | 965a1475b64d7db1466f8312db8938b158b0cfe3 (diff) | |
| download | CMake-d6219588c049c8d7ca1b328d918e410e9385f0c8.zip CMake-d6219588c049c8d7ca1b328d918e410e9385f0c8.tar.gz CMake-d6219588c049c8d7ca1b328d918e410e9385f0c8.tar.bz2 | |
COMP: fix compile issue on Sun
| -rw-r--r-- | Source/cmMakefile.cxx | 6 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3bb4c6c..78cc848 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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, diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 04712c0..e79b93d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -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 |