mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-04 04:03:22 +03:00
Code Activity

cmLocalGenerator: Make MoveSystemIncludesToEnd file-local

Browse Source
This commit is contained in:
Brad King committed 2018-10-18 08:26:27 -04:00
1 parent dacbb41455
commit 52311484dd
2 files changed
+6 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/cmLocalGenerator.cxx
+6 -5
View File
@@ -202,9 +202,10 @@ void cmLocalGenerator::ComputeObjectMaxPath()
this->ObjectMaxPathViolations.clear();
}
void cmLocalGenerator::MoveSystemIncludesToEnd(
std::vector<std::string>& includeDirs, const std::string& config,
const std::string& lang, const cmGeneratorTarget* target) const
static void MoveSystemIncludesToEnd(std::vector<std::string>& 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<std::string> 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<std::string>& dirs,
}
}
this->MoveSystemIncludesToEnd(dirs, config, lang, target);
MoveSystemIncludesToEnd(dirs, config, lang, target);
// Add standard include directories for this language.
{
Source/cmLocalGenerator.h
-4
View File
@@ -414,10 +414,6 @@ private:
int targetType);
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)