diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 11:50:29 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 19:36:12 (GMT) |
| commit | 21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a (patch) | |
| tree | 84f85642a636657bda78c378e6c6e43ddf18ad49 /Source/cmLocalGenerator.cxx | |
| parent | f1d845ae74dd9ba0520b1f97c851e439f1c4df07 (diff) | |
| download | CMake-21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a.zip CMake-21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a.tar.gz CMake-21b5fdf9a39f739c3566f3e77a4c5244da1b7e3a.tar.bz2 | |
Convert: Avoid START_OUTPUT enum when converting to relative paths
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 0162781..d909011 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -180,7 +180,8 @@ void cmLocalGenerator::GenerateTestFiles() for (vec_t::const_iterator i = children.begin(); i != children.end(); ++i) { // TODO: Use add_subdirectory instead? std::string outP = i->GetDirectory().GetCurrentBinary(); - outP = this->ConvertToRelativePath(outP, START_OUTPUT); + outP = + this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), outP); outP = cmOutputConverter::EscapeForCMake(outP); fout << "subdirs(" << outP << ")" << std::endl; } @@ -2246,7 +2247,7 @@ std::string cmLocalGenerator::ConstructComment( o != ccg.GetOutputs().end(); ++o) { comment += sep; comment += - this->ConvertToRelativePath(*o, cmOutputConverter::START_OUTPUT); + this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), *o); sep = ", "; } return comment; @@ -2522,7 +2523,7 @@ std::string cmLocalGenerator::GetObjectFileNameWithoutTarget( // Try referencing the source relative to the binary tree. std::string relFromBinary = - this->ConvertToRelativePath(fullPath, START_OUTPUT); + this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), fullPath); assert(!relFromBinary.empty()); bool relBinary = !cmSystemTools::FileIsFullPath(relFromBinary.c_str()); bool subBinary = relBinary && relFromBinary[0] != '.'; |