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
CMake
CMake
Commits
e278f5a8
Commit
e278f5a8
authored
Oct 04, 2016
by
Stephen Kelly
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert: Extract local variables
Remove comment made obsolete by them.
parent
51bc6bdd
Pipeline
#29745
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
14 deletions
+17
-14
Source/cmOutputConverter.cxx
Source/cmOutputConverter.cxx
+17
-14
No files found.
Source/cmOutputConverter.cxx
View file @
e278f5a8
...
...
@@ -91,20 +91,23 @@ std::string cmOutputConverter::ConvertToRelativePath(
return
remote_path
;
}
// Skip conversion if the path and local are not both in the source
// or both in the binary tree.
if
(
!
((
cmOutputConverterNotAbove
(
local_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopBinary
())
&&
cmOutputConverterNotAbove
(
remote_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopBinary
()))
||
(
cmOutputConverterNotAbove
(
local_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopSource
())
&&
cmOutputConverterNotAbove
(
remote_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopSource
()))))
{
const
bool
bothInBinary
=
cmOutputConverterNotAbove
(
local_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopBinary
())
&&
cmOutputConverterNotAbove
(
remote_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopBinary
());
const
bool
bothInSource
=
cmOutputConverterNotAbove
(
local_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopSource
())
&&
cmOutputConverterNotAbove
(
remote_path
.
c_str
(),
this
->
StateSnapshot
.
GetDirectory
().
GetRelativePathTopSource
());
if
(
!
(
bothInSource
||
bothInBinary
))
{
return
remote_path
;
}
...
...
Brad King
@brad.king
Mentioned in commit
9c4d1056
·
Oct 07, 2016
Mentioned in commit
9c4d1056
Mentioned in commit 9c4d105680c99e194c6d6063315ee2affd2a7b63
Toggle commit list
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