mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 04:09:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Make MoveSystemIncludesToEnd file-local

Browse Source
This commit is contained in:
Brad King
2018-09-25 11:21:00 -04:00
parent dacbb41455
commit 52311484dd
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalGenerator.cxx
+6 -5
View File
@@ -202,9 +202,10 @@ void cmLocalGenerator::ComputeObjectMaxPath()
this->ObjectMaxPathViolations.clear(); this->ObjectMaxPathViolations.clear();
} }
void cmLocalGenerator::MoveSystemIncludesToEnd( static void MoveSystemIncludesToEnd(std::vector<std::string>& includeDirs,
std::vector<std::string>& includeDirs, const std::string& config, const std::string& config,
const std::string& lang, const cmGeneratorTarget* target) const const std::string& lang,
const cmGeneratorTarget* target)
{ {
if (!target) { if (!target) {
return; return;
@@ -707,7 +708,7 @@ std::string cmLocalGenerator::GetIncludeFlags(
} }
std::vector<std::string> includes = includeDirs; std::vector<std::string> includes = includeDirs;
this->MoveSystemIncludesToEnd(includes, config, lang, target); MoveSystemIncludesToEnd(includes, config, lang, target);
OutputFormat shellFormat = forResponseFile ? RESPONSE : SHELL; OutputFormat shellFormat = forResponseFile ? RESPONSE : SHELL;
std::ostringstream includeFlags; std::ostringstream includeFlags;
@@ -960,7 +961,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
} }
} }
this->MoveSystemIncludesToEnd(dirs, config, lang, target); MoveSystemIncludesToEnd(dirs, config, lang, target);
// Add standard include directories for this language. // Add standard include directories for this language.
{ {
Source/cmLocalGenerator.h
-4
View File
@@ -414,10 +414,6 @@ private:
int targetType); int targetType);
void ComputeObjectMaxPath(); void ComputeObjectMaxPath();
void MoveSystemIncludesToEnd(std::vector<std::string>& includeDirs,
const std::string& config,
const std::string& lang,
cmGeneratorTarget const* target) const;
}; };
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)