Fix for visual studio
This commit is contained in:
parent
33d55456c3
commit
d79f47519c
@ -30,11 +30,6 @@
|
|||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
static struct tm* GetNightlyTime(std::string str)
|
static struct tm* GetNightlyTime(std::string str)
|
||||||
{
|
{
|
||||||
int hour;
|
|
||||||
int min;
|
|
||||||
int sec;
|
|
||||||
char stz[100];
|
|
||||||
int tz;
|
|
||||||
struct tm* lctime;
|
struct tm* lctime;
|
||||||
time_t tctime = time(0);
|
time_t tctime = time(0);
|
||||||
//Convert the nightly start time to seconds. Since we are
|
//Convert the nightly start time to seconds. Since we are
|
||||||
@ -391,7 +386,7 @@ void cmCTest::Finalize()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string cmCTest::FindExecutable(const char *exe)
|
std::string cmCTest::FindTheExecutable(const char *exe)
|
||||||
{
|
{
|
||||||
std::string fullPath = "";
|
std::string fullPath = "";
|
||||||
std::string dir;
|
std::string dir;
|
||||||
@ -1595,7 +1590,7 @@ void cmCTest::ProcessDirectory(std::vector<std::string> &passed,
|
|||||||
}
|
}
|
||||||
//std::cerr << "Testing " << args[0] << " ... ";
|
//std::cerr << "Testing " << args[0] << " ... ";
|
||||||
// find the test executable
|
// find the test executable
|
||||||
std::string testCommand = this->FindExecutable(args[1].Value.c_str());
|
std::string testCommand = this->FindTheExecutable(args[1].Value.c_str());
|
||||||
testCommand = cmSystemTools::ConvertToOutputPath(testCommand.c_str());
|
testCommand = cmSystemTools::ConvertToOutputPath(testCommand.c_str());
|
||||||
|
|
||||||
// continue if we did not find the executable
|
// continue if we did not find the executable
|
||||||
|
@ -87,7 +87,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
* Find the executable for a test
|
* Find the executable for a test
|
||||||
*/
|
*/
|
||||||
std::string FindExecutable(const char *exe);
|
std::string FindTheExecutable(const char *exe);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the cmake test
|
* Set the cmake test
|
||||||
|
Loading…
x
Reference in New Issue
Block a user