summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2008-06-17 16:44:18 (GMT)
committerDavid Cole <david.cole@kitware.com>2008-06-17 16:44:18 (GMT)
commit9a98928bd9862714ccbfe62158e76760efa324ca (patch)
tree421773013aa96ec338b660e600797f1055f5253d /Source
parent80714fb42f96a3486b8411cc28c0107a5aba1055 (diff)
downloadCMake-9a98928bd9862714ccbfe62158e76760efa324ca.zip
CMake-9a98928bd9862714ccbfe62158e76760efa324ca.tar.gz
CMake-9a98928bd9862714ccbfe62158e76760efa324ca.tar.bz2
COMP: Fix errors and warnings from continuous dashboards running different compilers...
Diffstat (limited to 'Source')
-rw-r--r--Source/CPack/cmCPackGenerator.cxx3
-rw-r--r--Source/CPack/cmCPackNSISGenerator.cxx2
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 396bd9e..d177bae 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -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;
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 6b43e1e..2dca019 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -192,7 +192,7 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName,
{
installTypesCode += "InstType \"";
installTypesCode += (*installTypeIt2)->DisplayName;
- installTypesCode += + "\"\n";
+ installTypesCode += "\"\n";
}
// Create installation groups first