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/cmLocalNinjaGenerator.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/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 5522e0d..398b55a 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -151,9 +151,10 @@ cmLocalNinjaGenerator::ConvertToLinkReference(std::string const& lib, std::string cmLocalNinjaGenerator::ConvertToIncludeReference(std::string const& path, - OutputFormat format) + OutputFormat format, + bool forceFullPaths) { - return this->Convert(path, HOME_OUTPUT, format); + return this->Convert(path, forceFullPaths? FULL : HOME_OUTPUT, format); } //---------------------------------------------------------------------------- |