diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-09-06 20:58:19 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 19:36:12 (GMT) |
| commit | 495e26ae57fc8f6a38f77ea0d0984fa2a3abe6c1 (patch) | |
| tree | 7e5418b043cb3081699d83199eb2045d28fd2cab | |
| parent | 4f68b2070fb90c50eb677dc74298f30ca13648a6 (diff) | |
| download | CMake-495e26ae57fc8f6a38f77ea0d0984fa2a3abe6c1.zip CMake-495e26ae57fc8f6a38f77ea0d0984fa2a3abe6c1.tar.gz CMake-495e26ae57fc8f6a38f77ea0d0984fa2a3abe6c1.tar.bz2 | |
Convert: Remove last use of START enum value
The enums just introduce unfamiliar names and don't provide value.
The order of arguments is reversed, as that is the result of the
cmOutputConverter::ConvertToRelativePath
overload which accepts the RelativeRoot enum.
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index a76bed3..0162781 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2514,7 +2514,8 @@ std::string cmLocalGenerator::GetObjectFileNameWithoutTarget( const char* fullPath = source.GetFullPath().c_str(); // Try referencing the source relative to the source tree. - std::string relFromSource = this->ConvertToRelativePath(fullPath, START); + std::string relFromSource = + this->ConvertToRelativePath(this->GetCurrentSourceDirectory(), fullPath); assert(!relFromSource.empty()); bool relSource = !cmSystemTools::FileIsFullPath(relFromSource.c_str()); bool subSource = relSource && relFromSource[0] != '.'; |