kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more warnings

Browse Source
This commit is contained in:
Ken Martin 2004-09-07 11:28:49 -04:00
parent 0a184c3d61
commit 3eae8f4405
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/CTest/cmCTestScriptHandler.cxx
View File

@ -175,30 +175,13 @@ int cmCTestScriptHandler::ExtractVariables()
// get some info that should be set // get some info that should be set
m_Makefile = m_LocalGenerator->GetMakefile(); m_Makefile = m_LocalGenerator->GetMakefile();
m_SourceDir.clear(); m_SourceDir = m_Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY");
m_BinaryDir.clear(); m_BinaryDir = m_Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY");
m_CTestCmd.clear(); m_CTestCmd = m_Makefile->GetSafeDefinition("CTEST_COMMAND");
if (m_Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY"))
{
m_SourceDir = m_Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY");
}
if (m_Makefile->GetDefinition("CTEST_BINARY_DIRECTORY"))
{
m_BinaryDir = m_Makefile->GetDefinition("CTEST_BINARY_DIRECTORY");
}
if (m_Makefile->GetDefinition("CTEST_COMMAND"))
{
m_CTestCmd = m_Makefile->GetDefinition("CTEST_COMMAND");
}
m_Backup = m_Makefile->IsOn("CTEST_BACKUP_AND_RESTORE"); m_Backup = m_Makefile->IsOn("CTEST_BACKUP_AND_RESTORE");
// in order to backup and restore we also must have the cvs root // in order to backup and restore we also must have the cvs root
m_CVSCheckOut.clear(); m_CVSCheckOut = m_Makefile->GetSafeDefinition("CTEST_CVS_CHECKOUT");
if (m_Makefile->GetDefinition("CTEST_CVS_CHECKOUT"))
{
m_CVSCheckOut = m_Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
}
if (m_Backup && m_CVSCheckOut.empty()) if (m_Backup && m_CVSCheckOut.empty())
{ {
cmSystemTools::Error( cmSystemTools::Error(
@ -241,11 +224,7 @@ int cmCTestScriptHandler::ExtractVariables()
atof(m_Makefile->GetDefinition("CTEST_CONTINUOUS_MINIMUM_INTERVAL")); atof(m_Makefile->GetDefinition("CTEST_CONTINUOUS_MINIMUM_INTERVAL"));
} }
m_CVSCmd.clear(); m_CVSCmd = m_Makefile->GetSafeDefinition("CTEST_CVS_COMMAND");
if (m_Makefile->GetDefinition("CTEST_CVS_COMMAND"))
{
m_CVSCmd = m_Makefile->GetDefinition("CTEST_CVS_COMMAND");
}
return 0; return 0;
} }