diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-04 20:56:30 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-06 18:02:03 (GMT) |
| commit | e278f5a84806a2b228182dc4a2cc98a1eaa19f8c (patch) | |
| tree | 0100588def9f3694c5a9658a0fc37dd7270ac6fd /Source/cmOutputConverter.cxx | |
| parent | 51bc6bddb91283da25d098492c9cc1b50e3008fc (diff) | |
| download | CMake-e278f5a84806a2b228182dc4a2cc98a1eaa19f8c.zip CMake-e278f5a84806a2b228182dc4a2cc98a1eaa19f8c.tar.gz CMake-e278f5a84806a2b228182dc4a2cc98a1eaa19f8c.tar.bz2 | |
Convert: Extract local variables
Remove comment made obsolete by them.
Diffstat (limited to 'Source/cmOutputConverter.cxx')
| -rw-r--r-- | Source/cmOutputConverter.cxx | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index 0b270aa..eee1988 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -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; } |