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

BUG: Handle -C properly for executables that are not in the project; Fix Bug #344 - ctest -C Debug

Browse Source
This commit is contained in:
Andy Cedilnik 2003-11-11 12:36:03 -05:00
parent 2bb8d871cb
commit 220aea3aee
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Source/cmCTest.cxx
View File

@ -449,49 +449,45 @@ std::string cmCTest::FindTheExecutable(const char *exe)
std::string file; std::string file;
cmSystemTools::SplitProgramPath(exe, dir, file); cmSystemTools::SplitProgramPath(exe, dir, file);
if(m_ConfigType != "") if(m_ConfigType != "" &&
::TryExecutable(dir.c_str(), file.c_str(), &fullPath,
m_ConfigType.c_str()))
{ {
if(TryExecutable(dir.c_str(), file.c_str(), &fullPath, return fullPath;
m_ConfigType.c_str())) }
if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"."))
{
return fullPath;
}
if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,""))
{
return fullPath;
}
if ( m_ConfigType == "" )
{
// No config type, so try to guess it
if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Release"))
{ {
return fullPath; return fullPath;
} }
dir += "/";
dir += m_ConfigType;
dir += "/";
dir += file;
cmSystemTools::Error("config type specified on the command line, but test executable not found.",
dir.c_str());
return "";
}
if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"."))
{
return fullPath;
}
if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"")) if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Debug"))
{ {
return fullPath; return fullPath;
} }
if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Release")) if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"MinSizeRel"))
{ {
return fullPath; return fullPath;
} }
if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Debug")) if (::TryExecutable(dir.c_str(),file.c_str(),&fullPath,"RelWithDebInfo"))
{ {
return fullPath; return fullPath;
} }
if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"MinSizeRel"))
{
return fullPath;
}
if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"RelWithDebInfo"))
{
return fullPath;
} }
// if everything else failed, check the users path // if everything else failed, check the users path
@ -503,7 +499,17 @@ std::string cmCTest::FindTheExecutable(const char *exe)
return path; return path;
} }
} }
if ( m_ConfigType != "" )
{
dir += "/";
dir += m_ConfigType;
dir += "/";
dir += file;
cmSystemTools::Error("config type specified on the command line, but test executable not found.",
dir.c_str());
return "";
}
return fullPath; return fullPath;
} }