diff options
| author | Ken Martin <ken.martin@kitware.com> | 2006-11-29 22:10:29 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2006-11-29 22:10:29 (GMT) |
| commit | 2915f24274abbea64b7f9806d787912a125f97d8 (patch) | |
| tree | 6c2d50fccb9b85bf92e408f328e3314d8b574021 /Source | |
| parent | f211823b5579be5aaf8f62dae870ad370326158f (diff) | |
| download | CMake-2915f24274abbea64b7f9806d787912a125f97d8.zip CMake-2915f24274abbea64b7f9806d787912a125f97d8.tar.gz CMake-2915f24274abbea64b7f9806d787912a125f97d8.tar.bz2 | |
COMP: fix compile issue on Sun hopefully
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index d230add..411dd25 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -894,7 +894,7 @@ void cmMakefile::RemoveDefineFlag(const char* flag) void cmMakefile::AddLinkLibrary(const char* lib, cmTarget::LinkLibraryType llt) { - std::pair<std::string, cmTarget::LinkLibraryType> tmp; + cmTarget::LibraryID tmp; tmp.first = lib; tmp.second = llt; this->LinkLibraries.push_back(tmp); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e79b93d..3ee22f3 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -464,7 +464,7 @@ void cmTarget::AddLinkLibrary(const std::string& lib, LinkLibraryType llt) { this->AddFramework(lib.c_str(), llt); - std::pair<std::string, cmTarget::LinkLibraryType> tmp; + cmTarget::LibraryID tmp; tmp.first = lib; tmp.second = llt; this->LinkLibraries.push_back(tmp); @@ -499,7 +499,7 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, return; } this->AddFramework(lib, llt); - std::pair<std::string, cmTarget::LinkLibraryType> tmp; + cmTarget::LibraryID tmp; tmp.first = lib; tmp.second = llt; this->LinkLibraries.push_back( tmp ); |