Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-23 09:37:51 +08:00
Code Issues Projects Releases Wiki Activity

Convert: Extract local variables for readability

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-04 22:56:30 +02:00
parent e278f5a848
commit b61c268bd0
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmOutputConverter.cxx
View File

@@ -91,21 +91,22 @@ std::string cmOutputConverter::ConvertToRelativePath(
return remote_path;
}
const std::string relativePathTopBinary =
this->StateSnapshot.GetDirectory().GetRelativePathTopBinary();
const std::string relativePathTopSource =
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());
cmOutputConverterNotAbove(local_path.c_str(),
relativePathTopBinary.c_str()) &&
cmOutputConverterNotAbove(remote_path.c_str(),
relativePathTopBinary.c_str());
const bool bothInSource =
cmOutputConverterNotAbove(
local_path.c_str(),
this->StateSnapshot.GetDirectory().GetRelativePathTopSource()) &&
cmOutputConverterNotAbove(
remote_path.c_str(),
this->StateSnapshot.GetDirectory().GetRelativePathTopSource());
cmOutputConverterNotAbove(local_path.c_str(),
relativePathTopSource.c_str()) &&
cmOutputConverterNotAbove(remote_path.c_str(),
relativePathTopSource.c_str());
if (!(bothInSource || bothInBinary)) {
return remote_path;