kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for paths with spaces and borland

This commit is contained in:
Bill Hoffman 2002-11-22 16:59:21 -05:00
parent 69806d705a
commit 3c6d30e4ab
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -1433,6 +1433,10 @@ void cmLocalUnixMakefileGenerator::BuildInSubDirectoryWindows(std::ostream& fout
if(target1) if(target1)
{ {
std::string dir = cmSystemTools::ConvertToOutputPath(directory); std::string dir = cmSystemTools::ConvertToOutputPath(directory);
if(dir[0] == '\"')
{
dir = dir.substr(1, dir.size()-2);
}
fout << "\tif not exist \"" << dir << "\\$(NULL)\"" fout << "\tif not exist \"" << dir << "\\$(NULL)\""
<< " " << " "
<< "$(MAKE) $(MAKESILENT) rebuild_cache\n"; << "$(MAKE) $(MAKESILENT) rebuild_cache\n";
@ -1823,7 +1827,10 @@ cmLocalUnixMakefileGenerator::ConvertToOutputForExisting(const char* p)
// if there is one // if there is one
if(ret.find(' ') != std::string::npos) if(ret.find(' ') != std::string::npos)
{ {
cmSystemTools::GetShortPath(ret.c_str(), ret); if(!cmSystemTools::GetShortPath(ret.c_str(), ret))
{
ret = p;
}
} }
return ret; return ret;
} }