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

STYLE: fix warnings: comparison signed/unsigned, unused variable 

Alex
This commit is contained in:
Alexander Neundorf 2007-12-19 03:56:13 -05:00
parent 04136a558a
commit ac017f7aba
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmInstallTargetGenerator.cxx
View File

@ -305,7 +305,7 @@ cmInstallTargetGenerator
os << indent << "IF(EXISTS \"" << toDestDirPath << "\")\n"; os << indent << "IF(EXISTS \"" << toDestDirPath << "\")\n";
this->AddInstallNamePatchRule(os, indent.Next(), config, toDestDirPath); this->AddInstallNamePatchRule(os, indent.Next(), config, toDestDirPath);
this->AddChrpathPatchRule(os, indent.Next(), config, toDestDirPath); this->AddChrpathPatchRule(os, indent.Next(), toDestDirPath);
this->AddRanlibRule(os, indent.Next(), type, toDestDirPath); this->AddRanlibRule(os, indent.Next(), type, toDestDirPath);
this->AddStripRule(os, indent.Next(), type, toDestDirPath); this->AddStripRule(os, indent.Next(), type, toDestDirPath);
os << indent << "ENDIF(EXISTS \"" << toDestDirPath << "\")\n"; os << indent << "ENDIF(EXISTS \"" << toDestDirPath << "\")\n";
@ -509,7 +509,7 @@ cmInstallTargetGenerator
void void
cmInstallTargetGenerator cmInstallTargetGenerator
::AddChrpathPatchRule(std::ostream& os, Indent const& indent, ::AddChrpathPatchRule(std::ostream& os, Indent const& indent,
const char* config, std::string const& toDestDirPath) std::string const& toDestDirPath)
{ {
if(this->ImportLibrary || if(this->ImportLibrary ||
!(this->Target->GetType() == cmTarget::SHARED_LIBRARY || !(this->Target->GetType() == cmTarget::SHARED_LIBRARY ||

2
Source/cmInstallTargetGenerator.h
View File

@ -55,7 +55,7 @@ protected:
const char* config, const char* config,
const std::string& toDestDirPath); const std::string& toDestDirPath);
void AddChrpathPatchRule(std::ostream& os, Indent const& indent, void AddChrpathPatchRule(std::ostream& os, Indent const& indent,
const char* config, std::string const& toDestDirPath); std::string const& toDestDirPath);
void AddStripRule(std::ostream& os, Indent const& indent, void AddStripRule(std::ostream& os, Indent const& indent,
cmTarget::TargetType type, cmTarget::TargetType type,

10
Source/cmLocalGenerator.cxx
View File

@ -1480,7 +1480,7 @@ bool cmLocalGenerator::GetLinkerArgs(std::string& rpath,
std::string& linkLibs, std::string& linkLibs,
cmTarget& tgt, cmTarget& tgt,
bool relink, bool relink,
int minRpathSize) unsigned int minRpathSize)
{ {
rpath = ""; rpath = "";
// collect all the flags needed for linking libraries // collect all the flags needed for linking libraries
@ -1658,16 +1658,14 @@ bool cmLocalGenerator::GetLinkerArgs(std::string& rpath,
} }
} }
if (rpath.size()<minRpathSize) while (rpath.size() < minRpathSize)
{ {
if (rpath.size()==0) if (rpath.size()==0)
{ {
rpath += runtimeFlag; rpath += runtimeFlag;
} }
while (rpath.size() < minRpathSize)
{ rpath += runtimeSep;
rpath += runtimeSep;
}
} }
return true; return true;
} }

2
Source/cmLocalGenerator.h
View File

@ -245,7 +245,7 @@ public:
///! Determine the arguments for the linker call, used also by ///! Determine the arguments for the linker call, used also by
/// cmInstallTargetGenerator /// cmInstallTargetGenerator
bool GetLinkerArgs(std::string& rpath, std::string& linkLibs, bool GetLinkerArgs(std::string& rpath, std::string& linkLibs,
cmTarget& tgt, bool relink, int minRpathSize); cmTarget& tgt, bool relink, unsigned int minRpathSize);
bool IsChrpathAvailable(const cmTarget& target); bool IsChrpathAvailable(const cmTarget& target);