diff options
author | Brad King <brad.king@kitware.com> | 2021-02-24 13:42:15 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-02-25 18:24:45 (GMT) |
commit | a133a583d484028f8b03bd791ebea8ba0cf96b84 (patch) | |
tree | 0674b75f633c0785f8b095b3606f84a6e87ba103 /Source/cmLocalNinjaGenerator.cxx | |
parent | c99db7153337865861ccb79c8f855d4d9f3539fc (diff) | |
download | CMake-a133a583d484028f8b03bd791ebea8ba0cf96b84.zip CMake-a133a583d484028f8b03bd791ebea8ba0cf96b84.tar.gz CMake-a133a583d484028f8b03bd791ebea8ba0cf96b84.tar.bz2 |
cmLocalGenerator: Clarify GetIncludeFlags signature
Make the `config` argument non-optional so all callers must be explicit.
Convert the path style argument to an enumeration to make its role clear
at call sites.
The path style argument is implemented by `ConvertToIncludeReference`,
which was introduced with the Ninja generator by commit 5b114c9bee
(Introduce a cmLocalGenerator::ConvertToIncludeReference function,
2011-09-07, v2.8.7~187^2~4). Its only purpose is to allow the Ninja
generator to use relative paths in `-I` flags. Add a comment explaining
this role.
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
-rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 8ed411a..64ff579 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -202,10 +202,10 @@ cmGlobalNinjaGenerator* cmLocalNinjaGenerator::GetGlobalNinjaGenerator() // Virtual protected methods. std::string cmLocalNinjaGenerator::ConvertToIncludeReference( - std::string const& path, cmOutputConverter::OutputFormat format, - bool forceFullPaths) + std::string const& path, IncludePathStyle pathStyle, + cmOutputConverter::OutputFormat format) { - if (forceFullPaths) { + if (pathStyle == IncludePathStyle::Absolute) { return this->ConvertToOutputFormat( cmSystemTools::CollapseFullPath(path, this->GetCurrentBinaryDirectory()), format); |