mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fix-include_directories-whitespace-handling'

Browse Source 
2f84dfe include_directories: Fix handling of empty or space-only entries
This commit is contained in:
Brad King
2013-05-21 15:22:27 -04:00
committed by CMake Topic Stage
parent d2cd362c31 2f84dfec93
commit 4825d70e83
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmIncludeDirectoryCommand.cxx
+13 -2
View File
@@ -116,13 +116,19 @@ void cmIncludeDirectoryCommand::GetIncludes(const std::string &arg,
{
std::string inc = arg.substr(lastPos,pos);
this->NormalizeInclude(inc);
incs.push_back(inc);
if (!inc.empty())
{
incs.push_back(inc);
}
}
lastPos = pos + 1;
}
std::string inc = arg.substr(lastPos);
this->NormalizeInclude(inc);
incs.push_back(inc);
if (!inc.empty())
{
incs.push_back(inc);
}
}
void cmIncludeDirectoryCommand::NormalizeInclude(std::string &inc)
@@ -133,6 +139,11 @@ void cmIncludeDirectoryCommand::NormalizeInclude(std::string &inc)
{
inc.assign(inc, b, 1+e-b); // copy the remaining substring
}
else
{
inc = "";
return;
}
if (!cmSystemTools::IsOff(inc.c_str()))
{