From 97a3d514acb8ce01839ebec0316277b9155518c2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 17 Jan 2005 15:09:25 -0500 Subject: BUG: Fix for relative path conversion when path is a subset of relative path root. --- Source/cmLocalUnixMakefileGenerator2.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx index 99acf28..c55831c 100644 --- a/Source/cmLocalUnixMakefileGenerator2.cxx +++ b/Source/cmLocalUnixMakefileGenerator2.cxx @@ -2022,14 +2022,16 @@ cmLocalUnixMakefileGenerator2::ConvertToRelativePath(const char* p) } // If the entire path is in common then just return a ".". - if(common == path.size()) + if(common == path.size() && + common == m_CurrentOutputDirectoryComponents.size()) { return "."; } // If the entire path is in common except for a trailing slash then // just return a "./". - if(common+1 == path.size() && path[common].size() == 0) + if(common+1 == path.size() && path[common].size() == 0 && + common == m_CurrentOutputDirectoryComponents.size()) { return "./"; } -- cgit v0.12