diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-28 14:07:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-28 14:07:44 (GMT) |
| commit | e6214b9a52ca4e79148017ef43e9228806999c06 (patch) | |
| tree | 962418d09d8af676801498dd679ae1e6ef8c494f /Source/cmGeneratorTarget.cxx | |
| parent | 5d96094874c148365441612158acf2039d421538 (diff) | |
| parent | 9259d7788193ad23aa429652af983afc3bc4a953 (diff) | |
| download | CMake-e6214b9a52ca4e79148017ef43e9228806999c06.zip CMake-e6214b9a52ca4e79148017ef43e9228806999c06.tar.gz CMake-e6214b9a52ca4e79148017ef43e9228806999c06.tar.bz2 | |
Merge branch 'fix-OBJECT_DEPENDS-after-path-normalization' into release
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 14b5a92..0c60237 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -676,6 +676,14 @@ void cmTargetTraceDependencies::Trace() { std::vector<std::string> objDeps; cmSystemTools::ExpandListArgument(additionalDeps, objDeps); + for(std::vector<std::string>::iterator odi = objDeps.begin(); + odi != objDeps.end(); ++odi) + { + if (cmSystemTools::FileIsFullPath(*odi)) + { + *odi = cmSystemTools::CollapseFullPath(*odi); + } + } this->FollowNames(objDeps); } |