diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-29 14:13:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-29 14:13:53 (GMT) |
| commit | abec4213d61cb74aba5da6f83220b38ef7882209 (patch) | |
| tree | deb91704649b5bfe0fcc2eac8ff12f2382578dea /Source/cmNinjaTargetGenerator.cxx | |
| parent | 5968ad58fd85e9703c36cd9154137f24c55e5413 (diff) | |
| parent | 9259d7788193ad23aa429652af983afc3bc4a953 (diff) | |
| download | CMake-abec4213d61cb74aba5da6f83220b38ef7882209.zip CMake-abec4213d61cb74aba5da6f83220b38ef7882209.tar.gz CMake-abec4213d61cb74aba5da6f83220b38ef7882209.tar.bz2 | |
Merge topic 'fix-OBJECT_DEPENDS-after-path-normalization'
9259d778 Normalize OBJECT_DEPENDS paths to match custom commands (#15366)
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 67824c6..ff41f6d 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -605,6 +605,14 @@ cmNinjaTargetGenerator if(const char* objectDeps = source->GetProperty("OBJECT_DEPENDS")) { std::vector<std::string> depList; cmSystemTools::ExpandListArgument(objectDeps, depList); + for(std::vector<std::string>::iterator odi = depList.begin(); + odi != depList.end(); ++odi) + { + if (cmSystemTools::FileIsFullPath(*odi)) + { + *odi = cmSystemTools::CollapseFullPath(*odi); + } + } std::transform(depList.begin(), depList.end(), std::back_inserter(implicitDeps), MapToNinjaPath()); } |