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

BUG: Fixed translation of relative path names to full path names.

Browse Source
This commit is contained in:
Brad King 2003-06-13 16:59:42 -04:00
parent dc87f60ca2
commit a5d930a686
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefile.cxx
View File

@ -1708,13 +1708,13 @@ cmSourceFile* cmMakefile::GetOrCreateSource(const char* sourceName,
bool generated) bool generated)
{ {
// make it a full path first // make it a full path first
std::string path = cmSystemTools::GetFilenamePath(sourceName);
std::string src = sourceName; std::string src = sourceName;
if (path.empty()) bool relative = !cmSystemTools::FileIsFullPath(sourceName);
if(relative)
{ {
src = this->GetCurrentDirectory(); src = this->GetCurrentDirectory();
src += "/"; src += "/";
src += cmSystemTools::GetFilenameName(sourceName); src += sourceName;
} }
// check to see if it exists // check to see if it exists
@ -1726,11 +1726,11 @@ cmSourceFile* cmMakefile::GetOrCreateSource(const char* sourceName,
// OK a source file object doesn't exist for the source // OK a source file object doesn't exist for the source
// maybe we made a bad call on assuming it was in the src tree // maybe we made a bad call on assuming it was in the src tree
if (generated && path.empty()) if (generated && relative)
{ {
src = this->GetCurrentOutputDirectory(); src = this->GetCurrentOutputDirectory();
src += "/"; src += "/";
src += cmSystemTools::GetFilenameName(sourceName); src += sourceName;
} }
ret = this->GetSource(src.c_str()); ret = this->GetSource(src.c_str());
if (ret) if (ret)
@ -1740,7 +1740,7 @@ cmSourceFile* cmMakefile::GetOrCreateSource(const char* sourceName,
// we must create one // we must create one
cmSourceFile file; cmSourceFile file;
path = cmSystemTools::GetFilenamePath(src); std::string path = cmSystemTools::GetFilenamePath(src);
if(generated) if(generated)
{ {
std::string ext = cmSystemTools::GetFilenameLastExtension(src); std::string ext = cmSystemTools::GetFilenameLastExtension(src);