Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
52311484
Commit
52311484
authored
Sep 25, 2018
by
Brad King
Browse files
cmLocalGenerator: Make MoveSystemIncludesToEnd file-local
parent
dacbb414
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmLocalGenerator.cxx
View file @
52311484
...
...
@@ -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
View file @
52311484
...
...
@@ -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)
...
...
Brad King
@brad.king
mentioned in commit
0cd778b0
·
Oct 22, 2018
mentioned in commit
0cd778b0
mentioned in commit 0cd778b0aa5093e4918fb9282e1849d8c2810a49
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment