COMP: Fix errors and warnings from continuous dashboards running different compilers...

This commit is contained in:
David Cole 2008-06-17 12:44:18 -04:00
parent 80714fb42f
commit 9a98928bd9
2 changed files with 4 additions and 1 deletions

View File

@ -245,6 +245,7 @@ int cmCPackGenerator::InstallProject()
int cmCPackGenerator::InstallProjectViaInstallCommands(
bool setDestDir, const char* tempInstallDirectory)
{
(void) setDestDir;
const char* installCommands = this->GetOption("CPACK_INSTALL_COMMANDS");
if ( installCommands && *installCommands )
{
@ -1199,6 +1200,7 @@ bool cmCPackGenerator::SupportsComponentInstallation() const
cmCPackInstallationType*
cmCPackGenerator::GetInstallationType(const char *projectName, const char *name)
{
(void) projectName;
bool hasInstallationType = this->InstallationTypes.count(name) != 0;
cmCPackInstallationType *installType = &this->InstallationTypes[name];
if (!hasInstallationType)
@ -1311,6 +1313,7 @@ cmCPackGenerator::GetComponent(const char *projectName, const char *name)
cmCPackComponentGroup*
cmCPackGenerator::GetComponentGroup(const char *projectName, const char *name)
{
(void) projectName;
std::string macroPrefix = "CPACK_COMPONENT_GROUP_"
+ cmsys::SystemTools::UpperCase(name);
bool hasGroup = this->ComponentGroups.count(name) != 0;

View File

@ -192,7 +192,7 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName,
{
installTypesCode += "InstType \"";
installTypesCode += (*installTypeIt2)->DisplayName;
installTypesCode += + "\"\n";
installTypesCode += "\"\n";
}
// Create installation groups first