diff options
author | Brad King <brad.king@kitware.com> | 2014-07-22 16:50:37 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-07-22 19:24:57 (GMT) |
commit | 85cea8a7af77cd482f4d3c7ec15f68bc5adeb0ba (patch) | |
tree | 4495141e654dda4b21f542ddb3a3703f86710102 /Source/cmDepends.cxx | |
parent | e7ee892b391992e0e8198917b8ef5cce76da2fd1 (diff) | |
download | CMake-85cea8a7af77cd482f4d3c7ec15f68bc5adeb0ba.zip CMake-85cea8a7af77cd482f4d3c7ec15f68bc5adeb0ba.tar.gz CMake-85cea8a7af77cd482f4d3c7ec15f68bc5adeb0ba.tar.bz2 |
cmDepends: Refactor object file path conversion
Delay conversion of the path to object files (on the left-hand side
of dependencies) until just before they are written. Also do not
convert the format of paths written to the 'depend.internal' file.
This is consistent with the way the right-hand side of dependencies
are already handled.
Diffstat (limited to 'Source/cmDepends.cxx')
-rw-r--r-- | Source/cmDepends.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index cdc480c..134f45b 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -58,12 +58,7 @@ bool cmDepends::Write(std::ostream &makeDepends, // Get the source and object file. std::string const& src = *si++; if(si == pairs.end()) { break; } - std::string obj = *si++; - - // Make sure the object file is relative to the top of the build tree. - obj = this->LocalGenerator->Convert(obj, - cmLocalGenerator::HOME_OUTPUT, - cmLocalGenerator::MAKERULE); + std::string const& obj = *si++; dependencies[obj].insert(src); } for(std::map<std::string, std::set<std::string> >::const_iterator |