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

ENH: Add support for make test even for fresh build of cmake

Browse Source
This commit is contained in:
Andy Cedilnik 2003-05-05 08:42:11 -04:00
parent 74eb17767d
commit 444ba9e442
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -2302,8 +2302,16 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
ctest += "ctest"; ctest += "ctest";
ctest += cmSystemTools::GetExecutableExtension(); ctest += cmSystemTools::GetExecutableExtension();
} }
if (cmSystemTools::FileExists(ctest.c_str())) if (!cmSystemTools::FileExists(ctest.c_str()))
{ {
if ( !m_Makefile->GetDefinition("PROJECT_NAME") ||
strcmp(m_Makefile->GetDefinition("PROJECT_NAME"), "CMake") )
{
return;
}
ctest = m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
ctest += "/ctest";
}
fout << "ARGS=\n"; fout << "ARGS=\n";
std::string cmd = this->ConvertToOutputForExisting(ctest.c_str()); std::string cmd = this->ConvertToOutputForExisting(ctest.c_str());
cmd += " $(ARGS)"; cmd += " $(ARGS)";
@ -2312,7 +2320,6 @@ void cmLocalUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"test", "test",
"", "",
cmd.c_str()); cmd.c_str());
}
} }
void void