summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/CPack/cmCPackLog.cxx5
-rw-r--r--Source/CPack/cpack.cxx3
2 files changed, 1 insertions, 7 deletions
diff --git a/Source/CPack/cmCPackLog.cxx b/Source/CPack/cmCPackLog.cxx
index d643589..331630b 100644
--- a/Source/CPack/cmCPackLog.cxx
+++ b/Source/CPack/cmCPackLog.cxx
@@ -82,9 +82,6 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_
// By default no logging
bool display = false;
- // Should we go to the error stream
- bool errorStream = false;
-
// Display file and line number if debug
bool useFileAndLine = m_Debug;
@@ -116,7 +113,6 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_
{
warning = true;
display = true;
- errorStream = true;
if ( needTagString )
{
if ( tagString.size() > 0 ) { tagString += ","; }
@@ -127,7 +123,6 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_
{
error = true;
display = true;
- errorStream = true;
if ( needTagString )
{
if ( tagString.size() > 0 ) { tagString += ","; }
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 41170f3..ef22f82 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -135,7 +135,6 @@ int main (int argc, char *argv[])
log.SetOutputPrefix("CPack: ");
log.SetVerbosePrefix("CPack Verbose: ");
- int res = 0;
cmSystemTools::EnableMSVCDebugHook();
if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
@@ -321,7 +320,7 @@ int main (int argc, char *argv[])
cmCPack_Log(&log, cmCPackLog::LOG_VERBOSE, "Use generator: " << cpackGenerator->GetNameOfClass() << std::endl);
cmCPack_Log(&log, cmCPackLog::LOG_VERBOSE, "For project: " << projName << std::endl);
- res = cpackGenerator->ProcessGenerator();
+ int res = cpackGenerator->ProcessGenerator();
if ( !res )
{
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Error when generating package: " << cpackProjectName.c_str() << std::endl);