summaryrefslogtreecommitdiffstats
path: root/Source/cmCTest.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-01-07 17:50:10 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-01-07 17:50:10 (GMT)
commitdcdde834a5bf4dff3ba7f5f64870a9ef06178dcd (patch)
tree7a3ede68b8d11f15c1f5758478cf6b62afdcbed9 /Source/cmCTest.cxx
parent4009a4b27607bce9b7a42b79082f741baaa57baf (diff)
downloadCMake-dcdde834a5bf4dff3ba7f5f64870a9ef06178dcd.zip
CMake-dcdde834a5bf4dff3ba7f5f64870a9ef06178dcd.tar.gz
CMake-dcdde834a5bf4dff3ba7f5f64870a9ef06178dcd.tar.bz2
ENH: remove warning
Diffstat (limited to 'Source/cmCTest.cxx')
-rw-r--r--Source/cmCTest.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index dd9bb5a..4e7df66 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -3835,7 +3835,7 @@ void cmCTest::FindRunningCMake(const char* arg0)
}
}
-void CMakeMessageCallback(const char* m, const char* title, bool& nomore, void* s)
+void CMakeMessageCallback(const char* m, const char*, bool&, void* s)
{
std::string* out = (std::string*)s;
*out += m;
@@ -3920,8 +3920,6 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
std::cerr << "Did you specify a --build-makeprogram and a --build-generator?\n";
}
int retVal = 0;
- int ret = 0;
-
std::string makeCommand = cmSystemTools::ConvertToOutputPath(m_BuildMakeProgram.c_str());
std::string lowerCaseCommand = cmSystemTools::LowerCase(makeCommand);
// if msdev is the make program then do the following
@@ -4046,7 +4044,7 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
}
// return to the original directory
cmSystemTools::ChangeDirectory(cwd.c_str());
- ret = 1;
+ retVal = 1;
}
if(outstring)