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

Merge topic 'suncc-fixes' 

97b65f81 Misc. fixes for the Oracle / Sun compiler.
This commit is contained in:
Brad King 2014-12-15 11:06:44 -05:00 committed by CMake Topic Stage
parent 4d2c629045 97b65f8156
commit 6da3f17309
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmComputeLinkDepends.cxx
View File

@ -266,9 +266,10 @@ cmComputeLinkDepends::Compute()
// Iterate in reverse order so we can keep only the last occurrence // Iterate in reverse order so we can keep only the last occurrence
// of a shared library. // of a shared library.
std::set<int> emmitted; std::set<int> emmitted;
const std::vector<int>& cFLO = this->FinalLinkOrder;
for(std::vector<int>::const_reverse_iterator for(std::vector<int>::const_reverse_iterator
li = this->FinalLinkOrder.rbegin(), li = cFLO.rbegin(),
le = this->FinalLinkOrder.rend(); le = cFLO.rend();
li != le; ++li) li != le; ++li)
{ {
int i = *li; int i = *li;

15
Source/cmFindPackageCommand.cxx
View File

@ -80,12 +80,15 @@ void cmFindPackageCommand::AppendSearchPathGroups()
PathLabel::SystemRegistry); PathLabel::SystemRegistry);
// Create the new path objects // Create the new path objects
this->LabeledPaths.insert(std::make_pair(PathLabel::UserRegistry, this->LabeledPaths.insert(
cmSearchPath(this))); std::pair<cmFindCommon::PathLabel, cmSearchPath>(
this->LabeledPaths.insert(std::make_pair(PathLabel::Builds, PathLabel::UserRegistry, cmSearchPath(this)));
cmSearchPath(this))); this->LabeledPaths.insert(
this->LabeledPaths.insert(std::make_pair(PathLabel::SystemRegistry, std::pair<cmFindCommon::PathLabel, cmSearchPath>(
cmSearchPath(this))); PathLabel::Builds, cmSearchPath(this)));
this->LabeledPaths.insert(
std::pair<cmFindCommon::PathLabel, cmSearchPath>(
PathLabel::SystemRegistry, cmSearchPath(this)));
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------