BUG: fix for bug 6197, absolute paths were not supported
This commit is contained in:
parent
c7de81f9a6
commit
ff04863d9d
|
@ -32,9 +32,17 @@ bool cmAuxSourceDirectoryCommand::InitialPass
|
||||||
std::string sourceListValue;
|
std::string sourceListValue;
|
||||||
std::string templateDirectory = args[0];
|
std::string templateDirectory = args[0];
|
||||||
this->Makefile->AddExtraDirectory(templateDirectory.c_str());
|
this->Makefile->AddExtraDirectory(templateDirectory.c_str());
|
||||||
std::string tdir = this->Makefile->GetCurrentDirectory();
|
std::string tdir;
|
||||||
|
if(!cmSystemTools::FileExists(templateDirectory.c_str()))
|
||||||
|
{
|
||||||
|
tdir = this->Makefile->GetCurrentDirectory();
|
||||||
tdir += "/";
|
tdir += "/";
|
||||||
tdir += templateDirectory;
|
tdir += templateDirectory;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tdir = templateDirectory;
|
||||||
|
}
|
||||||
|
|
||||||
// was the list already populated
|
// was the list already populated
|
||||||
const char *def = this->Makefile->GetDefinition(args[1].c_str());
|
const char *def = this->Makefile->GetDefinition(args[1].c_str());
|
||||||
|
|
Loading…
Reference in New Issue