ENH: better error reporting, and add NOTFOUND into cache for library and file find

This commit is contained in:
Bill Hoffman
2001-04-06 14:51:53 -04:00
parent 3355878eeb
commit 2a7964e310
3 changed files with 43 additions and 9 deletions

View File

@@ -29,8 +29,11 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
const char* cacheValue
= cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str());
if(cacheValue)
{
m_Makefile->AddDefinition(args[0].c_str(), cacheValue);
{
if(strcmp(cacheValue, "NOTFOUND") != 0)
{
m_Makefile->AddDefinition(args[0].c_str(), cacheValue);
}
return true;
}
std::vector<std::string> path;
@@ -45,8 +48,8 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
// add the standard path
cmSystemTools::GetPath(path);
for(unsigned int k=0; k < path.size(); k++)
unsigned int k;
for(k=0; k < path.size(); k++)
{
std::string tryPath = path[k];
tryPath += "/";
@@ -60,6 +63,19 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
return true;
}
}
cmCacheManager::GetInstance()->AddCacheEntry(args[0].c_str(),
"NOTFOUND",
cmCacheManager::PATH);
std::string message = "Library not found: ";
message += args[1];
message += "\n";
message += "looked in ";
for(k=0; k < path.size(); k++)
{
message += path[k];
message += "\n";
}
this->SetError(message.c_str());
return false;
}