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

Don't prepend a path before generator expressions in include_directories.

This commit is contained in:
Stephen Kelly 2012-09-20 23:22:59 +02:00
parent c6abc41eb5
commit 4557c8db48
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmIncludeDirectoryCommand.cxx
View File

@ -105,10 +105,13 @@ void cmIncludeDirectoryCommand::AddDirectory(const char *i,
cmSystemTools::ConvertToUnixSlashes(ret); cmSystemTools::ConvertToUnixSlashes(ret);
if(!cmSystemTools::FileIsFullPath(ret.c_str())) if(!cmSystemTools::FileIsFullPath(ret.c_str()))
{ {
std::string tmp = this->Makefile->GetStartDirectory(); if(ret[0] != '$' && ret[1] != '<')
tmp += "/"; {
tmp += ret; std::string tmp = this->Makefile->GetStartDirectory();
ret = tmp; tmp += "/";
tmp += ret;
ret = tmp;
}
} }
} }
this->Makefile->AddIncludeDirectory(ret.c_str(), before); this->Makefile->AddIncludeDirectory(ret.c_str(), before);