[Cmake-commits] [cmake-commits] david.cole committed cmCPackGenerator.cxx 1.7 1.8 cmCPackNSISGenerator.cxx 1.32 1.33

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackGenerator.cxx cmCPackNSISGenerator.cxx 
Log Message:
COMP: Fix errors and warnings from continuous dashboards running different compilers...


Index: cmCPackNSISGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -d -r1.32 -r1.33
*** cmCPackNSISGenerator.cxx	17 Jun 2008 15:39:26 -0000	1.32
--- cmCPackNSISGenerator.cxx	17 Jun 2008 16:44:18 -0000	1.33
***************
*** 193,197 ****
        installTypesCode += "InstType \"";
        installTypesCode += (*installTypeIt2)->DisplayName;
!       installTypesCode += + "\"\n";
        }
  
--- 193,197 ----
        installTypesCode += "InstType \"";
        installTypesCode += (*installTypeIt2)->DisplayName;
!       installTypesCode += "\"\n";
        }
  

Index: cmCPackGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenerator.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmCPackGenerator.cxx	17 Jun 2008 15:39:25 -0000	1.7
--- cmCPackGenerator.cxx	17 Jun 2008 16:44:18 -0000	1.8
***************
*** 246,249 ****
--- 246,250 ----
    bool setDestDir, const char* tempInstallDirectory)
  {
+   (void) setDestDir;
    const char* installCommands = this->GetOption("CPACK_INSTALL_COMMANDS");
    if ( installCommands && *installCommands )
***************
*** 1200,1203 ****
--- 1201,1205 ----
  cmCPackGenerator::GetInstallationType(const char *projectName, const char *name)
  {
+   (void) projectName;
    bool hasInstallationType = this->InstallationTypes.count(name) != 0;
    cmCPackInstallationType *installType = &this->InstallationTypes[name];
***************
*** 1312,1315 ****
--- 1314,1318 ----
  cmCPackGenerator::GetComponentGroup(const char *projectName, const char *name)
  {
+   (void) projectName;
    std::string macroPrefix = "CPACK_COMPONENT_GROUP_" 
          + cmsys::SystemTools::UpperCase(name);