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

clean up warning and use more short paths

This commit is contained in:
Bill Hoffman 2002-12-22 11:50:24 -05:00
parent 03bfa86394
commit d14ceb8a38
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -832,8 +832,6 @@ void cmLocalUnixMakefileGenerator::OutputLibraryRule(std::ostream& fout,
// collect up the link libraries // collect up the link libraries
cmOStringStream linklibs; cmOStringStream linklibs;
this->OutputLinkLibraries(linklibs, name, t); this->OutputLinkLibraries(linklibs, name, t);
const char* targetLinkFlags = t.GetProperty("LINK_FLAGS");
std::string allLinkFlags;
for(std::vector<std::string>::iterator i = commands.begin(); for(std::vector<std::string>::iterator i = commands.begin();
i != commands.end(); ++i) i != commands.end(); ++i)
{ {
@ -1332,8 +1330,8 @@ void cmLocalUnixMakefileGenerator::OutputBuildTargetInDirWindows(std::ostream& f
const char* makeTarget = library; const char* makeTarget = library;
std::string currentDir = std::string currentDir =
cmSystemTools::ConvertToOutputPath(m_Makefile->GetCurrentOutputDirectory()); cmSystemTools::ConvertToOutputPath(m_Makefile->GetCurrentOutputDirectory());
std::string wpath = cmSystemTools::ConvertToOutputPath(path); std::string wpath = this->ConvertToOutputForExisting(path);
std::string wfullpath = cmSystemTools::ConvertToOutputPath(fullpath); std::string wfullpath = this->ConvertToOutputForExisting(fullpath);
if(libOutPath && strcmp( libOutPath, "" ) != 0) if(libOutPath && strcmp( libOutPath, "" ) != 0)
{ {
makeTarget = wfullpath.c_str(); makeTarget = wfullpath.c_str();
@ -1363,8 +1361,8 @@ void cmLocalUnixMakefileGenerator::OutputBuildTargetInDir(std::ostream& fout,
{ {
makeTarget = fullpath; makeTarget = fullpath;
} }
fout << cmSystemTools::ConvertToOutputPath(fullpath) fout << this->ConvertToOutputForExisting(fullpath)
<< ":\n\tcd " << cmSystemTools::ConvertToOutputPath(path) << ":\n\tcd " << this->ConvertToOutputForExisting(path)
<< "; $(MAKE) $(MAKESILENT) cmake.depends" << "; $(MAKE) $(MAKESILENT) cmake.depends"
<< "; $(MAKE) $(MAKESILENT) cmake.check_depends" << "; $(MAKE) $(MAKESILENT) cmake.check_depends"
<< "; $(MAKE) $(MAKESILENT) -f cmake.check_depends" << "; $(MAKE) $(MAKESILENT) -f cmake.check_depends"
@ -1515,7 +1513,7 @@ void cmLocalUnixMakefileGenerator::BuildInSubDirectoryWindows(std::ostream& fout
{ {
if(target1) if(target1)
{ {
std::string dir = cmSystemTools::ConvertToOutputPath(directory); std::string dir = this->ConvertToOutputForExisting(directory);
if(dir[0] == '\"') if(dir[0] == '\"')
{ {
dir = dir.substr(1, dir.size()-2); dir = dir.substr(1, dir.size()-2);
@ -1539,7 +1537,7 @@ void cmLocalUnixMakefileGenerator::BuildInSubDirectoryWindows(std::ostream& fout
fout << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target2 << "\n"; fout << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target2 << "\n";
} }
std::string currentDir = m_Makefile->GetCurrentOutputDirectory(); std::string currentDir = m_Makefile->GetCurrentOutputDirectory();
fout << "\tcd " << cmSystemTools::ConvertToOutputPath(currentDir.c_str()) << "\n\n"; fout << "\tcd " << this->ConvertToOutputForExisting(currentDir.c_str()) << "\n\n";
} }
@ -1919,9 +1917,12 @@ 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)
{ {
if(!cmSystemTools::GetShortPath(ret.c_str(), ret)) if(cmSystemTools::FileExists(p))
{ {
ret = p; if(!cmSystemTools::GetShortPath(ret.c_str(), ret))
{
ret = p;
}
} }
} }
return ret; return ret;