diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-13 12:21:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-13 12:21:04 (GMT) |
| commit | cea13d5536ef77fb93ef8ae5abfa9c81920140e7 (patch) | |
| tree | 543640745dc1c8921f6b3033e4b250ebe6447e1a /Source/cmLocalGenerator.cxx | |
| parent | c11a342e652be170e232d100474836a239037623 (diff) | |
| parent | f4c5eade787f4f0a6e33fe029c2816580db06041 (diff) | |
| download | CMake-cea13d5536ef77fb93ef8ae5abfa9c81920140e7.zip CMake-cea13d5536ef77fb93ef8ae5abfa9c81920140e7.tar.gz CMake-cea13d5536ef77fb93ef8ae5abfa9c81920140e7.tar.bz2 | |
Merge topic 'fix-ninja-rc-include-flags'
f4c5eade Ninja: Fix RC include directories regression
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 4bd9191..50e279b 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1287,9 +1287,11 @@ cmLocalGenerator::ConvertToOutputForExisting(RelativeRoot remote, //---------------------------------------------------------------------------- std::string cmLocalGenerator::ConvertToIncludeReference(std::string const& path, - OutputFormat format) + OutputFormat format, + bool forceFullPaths) { - return this->ConvertToOutputForExisting(path, START_OUTPUT, format); + return this->ConvertToOutputForExisting( + path, forceFullPaths? FULL : START_OUTPUT, format); } //---------------------------------------------------------------------------- @@ -1297,6 +1299,7 @@ std::string cmLocalGenerator::GetIncludeFlags( const std::vector<std::string> &includes, cmGeneratorTarget* target, const std::string& lang, + bool forceFullPaths, bool forResponseFile, const std::string& config) { @@ -1401,7 +1404,7 @@ std::string cmLocalGenerator::GetIncludeFlags( flagUsed = true; } std::string includePath = - this->ConvertToIncludeReference(*i, shellFormat); + this->ConvertToIncludeReference(*i, shellFormat, forceFullPaths); if(quotePaths && includePath.size() && includePath[0] != '\"') { includeFlags << "\""; |