diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-09-20 21:22:59 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-09-21 11:28:54 (GMT) |
| commit | 4557c8db4813b4198fb7d64249e104bdcb828ae5 (patch) | |
| tree | ec9fff440a657a1b8aa882097790e9a0737405d5 | |
| parent | c6abc41eb5ece8fe10d08faf7792337a760d4251 (diff) | |
| download | CMake-4557c8db4813b4198fb7d64249e104bdcb828ae5.zip CMake-4557c8db4813b4198fb7d64249e104bdcb828ae5.tar.gz CMake-4557c8db4813b4198fb7d64249e104bdcb828ae5.tar.bz2 | |
Don't prepend a path before generator expressions in include_directories.
| -rw-r--r-- | Source/cmIncludeDirectoryCommand.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmIncludeDirectoryCommand.cxx b/Source/cmIncludeDirectoryCommand.cxx index 4dd98a1..11c5f4e 100644 --- a/Source/cmIncludeDirectoryCommand.cxx +++ b/Source/cmIncludeDirectoryCommand.cxx @@ -105,10 +105,13 @@ void cmIncludeDirectoryCommand::AddDirectory(const char *i, cmSystemTools::ConvertToUnixSlashes(ret); if(!cmSystemTools::FileIsFullPath(ret.c_str())) { - std::string tmp = this->Makefile->GetStartDirectory(); - tmp += "/"; - tmp += ret; - ret = tmp; + if(ret[0] != '$' && ret[1] != '<') + { + std::string tmp = this->Makefile->GetStartDirectory(); + tmp += "/"; + tmp += ret; + ret = tmp; + } } } this->Makefile->AddIncludeDirectory(ret.c_str(), before); |