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

BUG: Some calls to Convert() were converting for MAKEFILE but then passing the output to the build shell. The calls have now been converted to call Convert() with SHELL.

This commit is contained in:
Brad King 2007-03-08 10:31:03 -05:00
parent 00b4eeeded
commit 4089c76890
4 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.cxx
View File

@ -1320,7 +1320,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
linkFlags +=
this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
linkFlags += this->Convert((*i)->GetFullPath().c_str(),
START_OUTPUT,MAKEFILE);
START_OUTPUT, SHELL);
linkFlags += " ";
}
}

6
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -192,16 +192,16 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
std::string targetOutPathPDB =
this->Convert(targetFullPathPDB.c_str(),
cmLocalGenerator::FULL,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
// Convert to the output path to use in constructing commands.
std::string targetOutPath =
this->Convert(targetFullPath.c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
std::string targetOutPathReal =
this->Convert(targetFullPathReal.c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
// Get the language to use for linking this executable.
const char* linkLanguage =

28
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -148,7 +148,7 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
extraFlags +=
this->Convert((*i)->GetFullPath().c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
}
}
}
@ -269,19 +269,19 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
// arguments.
std::string targetOutPathPDB =
this->Convert(targetFullPathPDB.c_str(),cmLocalGenerator::FULL,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
std::string targetOutPath =
this->Convert(targetFullPath.c_str(),cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
std::string targetOutPathSO =
this->Convert(targetFullPathSO.c_str(),cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
std::string targetOutPathReal =
this->Convert(targetFullPathReal.c_str(),cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
std::string targetOutPathImport =
this->Convert(targetFullPathImport.c_str(),cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
// Add the link message.
std::string buildEcho = "Linking ";
@ -566,21 +566,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
objdir += this->Target->GetName();
objdir += ".dir";
vars.ObjectDir = objdir.c_str();
std::string targetLinkScriptPathReal;
if(useLinkScript)
{
// Paths in the link script are interpreted directly by the shell
// and not make.
targetLinkScriptPathReal =
this->Convert(targetFullPathReal.c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
vars.Target = targetLinkScriptPathReal.c_str();
}
else
{
vars.Target = targetOutPathReal.c_str();
}
vars.Target = targetOutPathReal.c_str();
std::string linkString = linklibs.str();
vars.LinkLibraries = linkString.c_str();
vars.ObjectsQuoted = buildObjs.c_str();

2
Source/cmMakefileTargetGenerator.cxx
View File

@ -480,7 +480,7 @@ cmMakefileTargetGenerator
}
targetOutPathPDB =
this->Convert(targetFullPathPDB.c_str(),cmLocalGenerator::FULL,
cmLocalGenerator::MAKEFILE);
cmLocalGenerator::SHELL);
}
cmLocalGenerator::RuleVariables vars;
vars.Language = lang;