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

ENH: fix bad error reporting with not found paths

This commit is contained in:
Ken Martin 2006-08-23 10:21:31 -04:00
parent 2994f3a158
commit 94e908ff2d
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmIncludeDirectoryCommand.cxx
View File

@ -48,22 +48,17 @@ bool cmIncludeDirectoryCommand
("Empty Include Directory Passed into INCLUDE_DIRECTORIES command."); ("Empty Include Directory Passed into INCLUDE_DIRECTORIES command.");
} }
std::string unixPath = *i; std::string unixPath = *i;
cmSystemTools::ConvertToUnixSlashes(unixPath); if (!cmSystemTools::IsOff(unixPath.c_str()))
if(!cmSystemTools::FileIsFullPath(unixPath.c_str()))
{ {
std::string tmp = this->Makefile->GetStartDirectory(); cmSystemTools::ConvertToUnixSlashes(unixPath);
tmp += "/"; if(!cmSystemTools::FileIsFullPath(unixPath.c_str()))
tmp += unixPath; {
unixPath = tmp; std::string tmp = this->Makefile->GetStartDirectory();
tmp += "/";
tmp += unixPath;
unixPath = tmp;
}
} }
/*
if ( !cmSystemTools::FileExists(unixPath.c_str()) )
{
std::string out = "Cannot find directory: " + unixPath;
this->SetError(out.c_str());
return false;
}
*/
this->Makefile->AddIncludeDirectory(unixPath.c_str(), before); this->Makefile->AddIncludeDirectory(unixPath.c_str(), before);
} }
return true; return true;