[cmake-commits] alex committed cmInstallTargetGenerator.cxx 1.48 1.49 cmInstallTargetGenerator.h 1.19 1.20 cmLocalGenerator.cxx 1.242 1.243 cmLocalGenerator.h 1.87 1.88

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv16970

Modified Files:
	cmInstallTargetGenerator.cxx cmInstallTargetGenerator.h 
	cmLocalGenerator.cxx cmLocalGenerator.h 
Log Message:

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

Alex


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- cmLocalGenerator.cxx	18 Dec 2007 22:50:27 -0000	1.242
+++ cmLocalGenerator.cxx	19 Dec 2007 08:56:13 -0000	1.243
@@ -1480,7 +1480,7 @@
                                      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 @@
       }
     }
 
-  if (rpath.size()<minRpathSize)
+  while (rpath.size() < minRpathSize)
     {
     if (rpath.size()==0)
       {
       rpath += runtimeFlag;
       }
-    while (rpath.size() < minRpathSize)
-      {
-      rpath += runtimeSep;
-      }
+
+    rpath += runtimeSep;
     }
   return true;
 }

Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- cmInstallTargetGenerator.cxx	18 Dec 2007 22:50:27 -0000	1.48
+++ cmInstallTargetGenerator.cxx	19 Dec 2007 08:56:13 -0000	1.49
@@ -305,7 +305,7 @@
 
   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 @@
 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 ||

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- cmLocalGenerator.h	18 Dec 2007 22:50:27 -0000	1.87
+++ cmLocalGenerator.h	19 Dec 2007 08:56:13 -0000	1.88
@@ -245,7 +245,7 @@
   ///! 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);
 

Index: cmInstallTargetGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cmInstallTargetGenerator.h	18 Dec 2007 22:50:27 -0000	1.19
+++ cmInstallTargetGenerator.h	19 Dec 2007 08:56:13 -0000	1.20
@@ -55,7 +55,7 @@
                                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,