diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-05 13:44:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-05 13:44:13 (GMT) |
| commit | 4b9188825a0c61ce370855d2ce42da97dc7b9a7f (patch) | |
| tree | 33f0aeb3a3387af334a6646864214dfecdd5f39e /Source | |
| parent | e31caa69b9104d350ff89a9eecf6f9548c477b95 (diff) | |
| parent | b8cc6f4eba0b7349de81a48aea18a43f99e78ca5 (diff) | |
| download | CMake-4b9188825a0c61ce370855d2ce42da97dc7b9a7f.zip CMake-4b9188825a0c61ce370855d2ce42da97dc7b9a7f.tar.gz CMake-4b9188825a0c61ce370855d2ce42da97dc7b9a7f.tar.bz2 | |
Merge branch 'fix-include_directories-whitespace-handling' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmIncludeDirectoryCommand.cxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Source/cmIncludeDirectoryCommand.cxx b/Source/cmIncludeDirectoryCommand.cxx index ffb0e80..30c1743 100644 --- a/Source/cmIncludeDirectoryCommand.cxx +++ b/Source/cmIncludeDirectoryCommand.cxx @@ -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())) { |