diff options
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmInstallTargetGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 10 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 9998d0d83c..15aa9e6518 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -305,7 +305,7 @@ cmInstallTargetGenerator os << indent << "IF(EXISTS \"" << toDestDirPath << "\")\n"; 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->AddStripRule(os, indent.Next(), type, toDestDirPath); os << indent << "ENDIF(EXISTS \"" << toDestDirPath << "\")\n"; @@ -509,7 +509,7 @@ cmInstallTargetGenerator void cmInstallTargetGenerator ::AddChrpathPatchRule(std::ostream& os, Indent const& indent, - const char* config, std::string const& toDestDirPath) + std::string const& toDestDirPath) { if(this->ImportLibrary || !(this->Target->GetType() == cmTarget::SHARED_LIBRARY || diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h index 3fdd5bfe32..e37a5ef015 100644 --- a/Source/cmInstallTargetGenerator.h +++ b/Source/cmInstallTargetGenerator.h @@ -55,7 +55,7 @@ protected: const char* config, const std::string& toDestDirPath); 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, cmTarget::TargetType type, diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index bf9175198b..830f8f3b28 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1480,7 +1480,7 @@ bool cmLocalGenerator::GetLinkerArgs(std::string& rpath, std::string& linkLibs, cmTarget& tgt, bool relink, - int minRpathSize) + unsigned int minRpathSize) { rpath = ""; // 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) { rpath += runtimeFlag; } - while (rpath.size() < minRpathSize) - { - rpath += runtimeSep; - } + + rpath += runtimeSep; } return true; } diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 101525175e..2056007f2a 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -245,7 +245,7 @@ public: ///! Determine the arguments for the linker call, used also by /// cmInstallTargetGenerator 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); |