Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marc Chevrier
CMake
Commits
7fa657b4
Commit
7fa657b4
authored
Oct 31, 2019
by
Brad King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'autogen_windows_search_fix' into release-3.16
Merge-request: !3962
parents
e5cc8f57
90d643c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
Source/cmQtAutoMocUic.cxx
Source/cmQtAutoMocUic.cxx
+3
-5
No files found.
Source/cmQtAutoMocUic.cxx
View file @
7fa657b4
...
...
@@ -1342,10 +1342,9 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader(
auto
findHeader
=
[
this
,
&
headerHandle
](
std
::
string
const
&
basePath
)
->
bool
{
bool
found
=
false
;
std
::
string
const
baseCollapsed
=
this
->
Gen
()
->
CollapseFullPathTS
(
cmStrCat
(
basePath
,
'.'
));
for
(
std
::
string
const
&
ext
:
this
->
BaseConst
().
HeaderExtensions
)
{
std
::
string
const
testPath
=
cmStrCat
(
baseCollapsed
,
ext
);
std
::
string
const
testPath
=
this
->
Gen
()
->
CollapseFullPathTS
(
cmStrCat
(
basePath
,
'.'
,
ext
));
cmFileTime
fileTime
;
if
(
!
fileTime
.
Load
(
testPath
))
{
// File not found
...
...
@@ -1377,8 +1376,7 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader(
}
}
if
(
!
found
)
{
this
->
SearchLocations
.
emplace_back
(
cmQtAutoGen
::
ParentDir
(
baseCollapsed
));
this
->
SearchLocations
.
emplace_back
(
cmQtAutoGen
::
ParentDir
(
basePath
));
}
return
found
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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