From 52311484dd8c7d3882f7f4c75efe0c3855c2f982 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 25 Sep 2018 11:21:00 -0400 Subject: cmLocalGenerator: Make MoveSystemIncludesToEnd file-local --- Source/cmLocalGenerator.cxx | 11 ++++++----- Source/cmLocalGenerator.h | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 941d787..7d922d7 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -202,9 +202,10 @@ void cmLocalGenerator::ComputeObjectMaxPath() this->ObjectMaxPathViolations.clear(); } -void cmLocalGenerator::MoveSystemIncludesToEnd( - std::vector& includeDirs, const std::string& config, - const std::string& lang, const cmGeneratorTarget* target) const +static void MoveSystemIncludesToEnd(std::vector& includeDirs, + const std::string& config, + const std::string& lang, + const cmGeneratorTarget* target) { if (!target) { return; @@ -707,7 +708,7 @@ std::string cmLocalGenerator::GetIncludeFlags( } std::vector includes = includeDirs; - this->MoveSystemIncludesToEnd(includes, config, lang, target); + MoveSystemIncludesToEnd(includes, config, lang, target); OutputFormat shellFormat = forResponseFile ? RESPONSE : SHELL; std::ostringstream includeFlags; @@ -960,7 +961,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector& dirs, } } - this->MoveSystemIncludesToEnd(dirs, config, lang, target); + MoveSystemIncludesToEnd(dirs, config, lang, target); // Add standard include directories for this language. { diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index f8d70ca..acdad64 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -414,10 +414,6 @@ private: int targetType); void ComputeObjectMaxPath(); - void MoveSystemIncludesToEnd(std::vector& includeDirs, - const std::string& config, - const std::string& lang, - cmGeneratorTarget const* target) const; }; #if defined(CMAKE_BUILD_WITH_CMAKE) -- cgit v0.12