diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2003-12-30 13:41:04 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2003-12-30 13:41:04 (GMT) |
| commit | ae69928e69b81a08272ff5eb53a94f198d4952e1 (patch) | |
| tree | e286a28f745230015ef27af3fc82c1805e69b0ee /Source/cmLocalGenerator.cxx | |
| parent | bbfc747f2e63dcc57ba983cc5aec09bf0f5547b4 (diff) | |
| download | CMake-ae69928e69b81a08272ff5eb53a94f198d4952e1.zip CMake-ae69928e69b81a08272ff5eb53a94f198d4952e1.tar.gz CMake-ae69928e69b81a08272ff5eb53a94f198d4952e1.tar.bz2 | |
BUG: borland make treats ./target and target as different also convert to outputpathrelative may get passed a quoted path
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 32f0952..e3454ba 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -106,13 +106,16 @@ std::string cmLocalGenerator::ConvertToRelativeOutputPath(const char* p) // Do the work of converting to a relative path std::string pathIn = p; - bool ispath = false; if(pathIn.find('/') == pathIn.npos) { return pathIn; } - + if(pathIn.size() && pathIn[0] == '\"') + { + pathIn = pathIn.substr(1, pathIn.size()-2); + } + std::string ret = pathIn; if(m_CurrentOutputDirectory.size() <= ret.size()) { @@ -180,7 +183,8 @@ std::string cmLocalGenerator::ConvertToRelativeOutputPath(const char* p) { ret = relpath; } - if(ret.size() && ret[0] != '/' && ret[0] != '.') + if(ret.size() + && ret[0] != '\"' && ret[0] != '/' && ret[0] != '.') { if(ret.size() > 1 && ret[1] != ':') { |