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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmFindIncludeCommand.cxx
View File

@ -28,9 +28,12 @@ bool cmFindIncludeCommand::Invoke(std::vector<std::string>& args)
// already, if so use that value and don't look for the program // already, if so use that value and don't look for the program
const char* cacheValue const char* cacheValue
= cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str()); = cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str());
if(cacheValue) 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; return true;
} }
std::vector<std::string> path; std::vector<std::string> path;
@ -45,8 +48,8 @@ bool cmFindIncludeCommand::Invoke(std::vector<std::string>& args)
// add the standard path // add the standard path
cmSystemTools::GetPath(path); cmSystemTools::GetPath(path);
unsigned int k;
for(unsigned int k=0; k < path.size(); k++) for(k=0; k < path.size(); k++)
{ {
std::string tryPath = path[k]; std::string tryPath = path[k];
tryPath += "/"; tryPath += "/";
@ -61,6 +64,19 @@ bool cmFindIncludeCommand::Invoke(std::vector<std::string>& args)
return true; return true;
} }
} }
cmCacheManager::GetInstance()->AddCacheEntry(args[0].c_str(),
"NOTFOUND",
cmCacheManager::PATH);
std::string message = "Include 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; return false;
} }

24
Source/cmFindLibraryCommand.cxx
View File

@ -29,8 +29,11 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
const char* cacheValue const char* cacheValue
= cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str()); = cmCacheManager::GetInstance()->GetCacheValue(args[0].c_str());
if(cacheValue) 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; return true;
} }
std::vector<std::string> path; std::vector<std::string> path;
@ -45,8 +48,8 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
// add the standard path // add the standard path
cmSystemTools::GetPath(path); cmSystemTools::GetPath(path);
unsigned int k;
for(unsigned int k=0; k < path.size(); k++) for(k=0; k < path.size(); k++)
{ {
std::string tryPath = path[k]; std::string tryPath = path[k];
tryPath += "/"; tryPath += "/";
@ -60,6 +63,19 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
return true; 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; return false;
} }

4
Source/cmMakefile.cxx
View File

@ -190,7 +190,9 @@ bool cmMakefile::ReadListFile(const char* filename)
{ {
if(!usedCommand->Invoke(arguments)) if(!usedCommand->Invoke(arguments))
{ {
cmSystemTools::Error(usedCommand->GetError()); cmSystemTools::Error(usedCommand->GetName(),
": Error : \n",
usedCommand->GetError());
} }
else else
{ {